From 9f4dd88b41761e60f1d999ffacec6b922e7d839e Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric.bail@free.fr>
Date: Fri, 16 Mar 2012 11:25:14 +0000
Subject: [PATCH] eina: fix build when valgrind is not in a standard location.

Patch by Raphael Kubo da Costa <rakuco@freebsd.org>.


SVN revision: 69456
---
 legacy/eina/ChangeLog                                         | 4 ++++
 legacy/eina/src/lib/Makefile.am                               | 3 ++-
 .../eina/src/modules/mp/chained_pool/eina_chained_mempool.c   | 2 +-
 legacy/eina/src/modules/mp/one_big/eina_one_big.c             | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/legacy/eina/ChangeLog b/legacy/eina/ChangeLog
index 4c58513d5e..12376974bb 100644
--- a/legacy/eina/ChangeLog
+++ b/legacy/eina/ChangeLog
@@ -237,3 +237,7 @@
 2012-03-14  Cedric Bail
 
 	* Fix a dead lock in Eina_File.
+
+2012-03-16  Raphael Kubo da Costa
+
+	* Adjust Valgrind's CFLAGS to fix the build when it is in a non-default location.
diff --git a/legacy/eina/src/lib/Makefile.am b/legacy/eina/src/lib/Makefile.am
index 880f00b585..5de2848839 100644
--- a/legacy/eina/src/lib/Makefile.am
+++ b/legacy/eina/src/lib/Makefile.am
@@ -6,7 +6,8 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EFL_EINA_BUILD@
+@EFL_EINA_BUILD@ \
+@VALGRIND_CFLAGS@
 
 base_sources = \
 eina_accessor.c \
diff --git a/legacy/eina/src/modules/mp/chained_pool/eina_chained_mempool.c b/legacy/eina/src/modules/mp/chained_pool/eina_chained_mempool.c
index 020d0ad3e0..e56df4cee6 100644
--- a/legacy/eina/src/modules/mp/chained_pool/eina_chained_mempool.c
+++ b/legacy/eina/src/modules/mp/chained_pool/eina_chained_mempool.c
@@ -52,7 +52,7 @@
 #include "eina_private.h"
 
 #ifndef NVALGRIND
-# include <valgrind/memcheck.h>
+# include <memcheck.h>
 #endif
 
 #if defined DEBUG || defined EINA_DEBUG_MALLOC
diff --git a/legacy/eina/src/modules/mp/one_big/eina_one_big.c b/legacy/eina/src/modules/mp/one_big/eina_one_big.c
index dadec652a2..1159378dee 100644
--- a/legacy/eina/src/modules/mp/one_big/eina_one_big.c
+++ b/legacy/eina/src/modules/mp/one_big/eina_one_big.c
@@ -42,7 +42,7 @@
 #include "eina_lock.h"
 
 #ifndef NVALGRIND
-# include <valgrind/memcheck.h>
+# include <memcheck.h>
 #endif
 
 #include "eina_private.h"