diff options
| author | Francis Dupont <fdupont@isc.org> | 2015-11-16 15:14:05 +0100 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2015-11-16 15:14:05 +0100 |
| commit | 79bce3a51d1cc41f1bafa52bd16698cd5b73d570 (patch) | |
| tree | ff0f24c13dafdf9c6a23afcdd2edd59754cc0bef | |
| parent | 0fb9c8a1a27f0ae78da3e475e5c4f1eac46e3f24 (diff) | |
| download | isc-dhcp-79bce3a51d1cc41f1bafa52bd16698cd5b73d570.tar.gz | |
Addressed comments. Required regen
| -rw-r--r-- | client/tests/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | server/tests/Makefile.am | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am index c07c504a..77fb4dac 100644 --- 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 a5937ac8..924fc9d4 100644 --- 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 1d176af0..0353c647 100644 --- 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 |