From 5986d22e621e0c682f319bb6a0a8e622a8c0970d Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Sun, 27 Jul 2014 08:45:50 +0200 Subject: Attempt to fix cmockery2 build The current code assumes cmockery2 is installed in default paths. Use PKG_MODULES_CHECK to find it using pkg-config if it is not. If not found by pkg-config, try AC_CHECK_LIB. There are also some build flag adjustement so that local overrides do not loose the required -I flags. This includes and enhance http://review.gluster.org/8340/ BUG: 764655 Change-Id: Ide9f77d1e70afe3c1c5c57ae2b93127af6a425f9 Signed-off-by: Emmanuel Dreyfus Reviewed-on: http://review.gluster.org/8365 Reviewed-by: Harshavardhana Tested-by: Harshavardhana Tested-by: Gluster Build System --- xlators/cluster/dht/src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xlators') diff --git a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am index 9b5d6897984..46a2bcd06b8 100644 --- a/xlators/cluster/dht/src/Makefile.am +++ b/xlators/cluster/dht/src/Makefile.am @@ -45,7 +45,7 @@ dht_layout_unittest_CPPFLAGS = $(AM_CPPFLAGS) dht_layout_unittest_SOURCES = unittest/dht_layout_unittest.c \ unittest/dht_layout_mock.c \ dht-layout.c -dht_layout_unittest_CFLAGS = $(UNITTEST_CFLAGS) +dht_layout_unittest_CFLAGS = $(AM_CFLAGS) $(UNITTEST_CFLAGS) dht_layout_unittest_LDFLAGS = $(UNITTEST_LDFLAGS) noinst_PROGRAMS += dht_layout_unittest TESTS += dht_layout_unittest -- cgit