Addressed comments. Required regen

diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am
index c07c504a943a38a930d8aad0956d684dc93be4ce..77fb4dace1a5d35badeea5573b3be2aa1db43ee2 100644 (file)
--- a/client/tests/Makefile.am
+++ b/client/tests/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = .
 BINDLIBDIR = @BINDDIR@/lib
 
 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
-AM_CPPFLAGS += -I$(top_srcdir)/bind/include -I$(top_srcdir)
+AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
 AM_CPPFLAGS += -DLOCALSTATEDIR='"."'
 AM_CPPFLAGS += -DCLIENT_PATH='"."'
 

diff --git a/configure.ac b/configure.ac
index a5937ac814bcfdcae93bdb7c441b1bebc6a68f1c..924fc9d415092cd1351edfe70991f1fcb5780ab4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -611,6 +611,8 @@ no)
        BINDDIR="$use_libbind"
        if test ! -d "bind"; then
                # no bind directory, create it with a fake Makefile.in
+               # (AC_CONFIG_FILES and top Makefile refer to it so
+               # it must exits)
                mkdir bind
                cat > bind/Makefile.in << EOF
 # placeholder

diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index 1d176af074433a925cc2bfb2a84d763a2d379400..0353c64758a18cdea2bd117a2d9f834721471ca8 100644 (file)
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = .
 BINDLIBDIR = @BINDDIR@/lib
 
 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
-AM_CPPFLAGS += -I$(top_srcdir)/bind/include -I$(top_srcdir)
+AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
 AM_CPPFLAGS += -DLOCALSTATEDIR='"."'
 
 EXTRA_DIST = Atffile