regen

diff --git a/Makefile.in b/Makefile.in
index 38a7f1e6a3d1934587e098bb020132a89128a562..d65dd6efce27454951d55e3cd5b18dad77b3dfb0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -242,6 +242,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -352,6 +353,11 @@ EXTRA_DIST = RELNOTES LICENSE \
 
 SUBDIRS = @BINDSRCDIR@ includes tests common omapip client dhcpctl relay server
 nobase_include_HEADERS = dhcpctl/dhcpctl.h
+
+#
+# distcheck tuning
+#
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_ATF_CONFIGURE_FLAG@
 all: all-recursive
 
 .SUFFIXES:

diff --git a/client/Makefile.in b/client/Makefile.in
index af0a58e0ebb0866d55e150814a0569987d2aeec7..0ec552fbd6f511c77811d8ecbe30ecff5fc5a86b 100644 (file)
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -250,6 +250,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@

diff --git a/client/tests/Makefile.in b/client/tests/Makefile.in
index 2195e92856973619d7bf40891dbece08742edb44..bd0856d2c81176605f007a357a17ca2de494b197 100644 (file)
--- a/client/tests/Makefile.in
+++ b/client/tests/Makefile.in
@@ -223,6 +223,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@

diff --git a/common/Makefile.in b/common/Makefile.in
index dff400fd0ea64458cda4060dbd5bc923a63dda70..89635a85f4fe3a0d5b23c1dce6838da5f84ae364 100644 (file)
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -257,6 +257,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@

diff --git a/common/tests/Makefile.in b/common/tests/Makefile.in
index d91d813678ea2b26d6710f799812d5617c1acfcd..432fcdcac77973819304a727b7792192e0a1bab4 100644 (file)
--- a/common/tests/Makefile.in
+++ b/common/tests/Makefile.in
@@ -261,6 +261,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@

diff --git a/configure b/configure
index 936660bcaf245eae144bc21655a6a5b6eeb12e20..1b74d509aa563711becd33754e977cc53013f3f4 100755 (executable)
--- a/configure
+++ b/configure
@@ -629,6 +629,7 @@ LDAP_CFLAGS
 BINDSRCDIR
 BINDDIR
 ac_prefix_program
+DISTCHECK_ATF_CONFIGURE_FLAG
 HAVE_ATF_FALSE
 HAVE_ATF_TRUE
 ATF_BIN
@@ -5430,6 +5431,7 @@ fi
 
 # Testing section
 
+DISTCHECK_ATF_CONFIGURE_FLAG=
 atf_path="no"
 
 # Check whether --with-atf was given.
@@ -5446,6 +5448,7 @@ else
 fi
 
 if test "$atf_path" = "bind" ; then
+    DISTCHECK_ATF_CONFIGURE_FLAG="--with-atf=bind"
     atf_pcp="bind"
     atf_path="\${top_srcdir}/bind/atf"
     ATF_CFLAGS="-I$atf_path/include -DUNIT_TEST"
@@ -5456,6 +5459,7 @@ if test "$atf_path" = "bind" ; then
 
     BINDCONFIG="$BINDCONFIG --with-atf"
 elif test "$atf_path" != "no" ; then
+    DISTCHECK_ATF_CONFIGURE_FLAG="--with-atf=$atf_path"
     # Config path for pkg-config
     atf_pcp=""
     if test "$atf_path" != "yes" ; then
@@ -5516,6 +5520,7 @@ $as_echo "#define HAVE_ATF 1" >>confdefs.h
 
 fi
 
+
 ###
 ### Path fun.  Older versions of DHCP were installed in /usr/sbin, so we
 ### need to look there and potentially overwrite by default (but not if
@@ -6529,6 +6534,8 @@ fi
 
 
 # figure out pointer size
+SAVE_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -I$srcdir"
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -6566,6 +6573,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+CFLAGS="$SAVE_CFLAGS"
 
 # Solaris does not have the msg_control or msg_controlen members
 # in the msghdr structure unless you define:

diff --git a/dhcpctl/Makefile.in b/dhcpctl/Makefile.in
index 1894aa4da61f08db9a9f9c4f363816249018bfa1..6d0d22fbdd6efc70457143eedd10ca0fe5dc98b4 100644 (file)
--- a/dhcpctl/Makefile.in
+++ b/dhcpctl/Makefile.in
@@ -227,6 +227,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@

diff --git a/includes/Makefile.in b/includes/Makefile.in
index bb74d1088553e314fb7cade6065f326708ebec5d..ba1db6011cfac97c89c274aee4c90ec590b9d759 100644 (file)
--- a/includes/Makefile.in
+++ b/includes/Makefile.in
@@ -179,6 +179,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@

diff --git a/omapip/Makefile.in b/omapip/Makefile.in
index 0c0a2bc3e1272e67b882d9376da910e5c823389e..11294de31643281e5cedc4abb568f7563041ae1a 100644 (file)
--- a/omapip/Makefile.in
+++ b/omapip/Makefile.in
@@ -222,6 +222,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@

diff --git a/relay/Makefile.in b/relay/Makefile.in
index 134e1cbc043ac54320c960d2e49e94d0652e6a2e..fa1897e269259637b48e308fc32ebc5ed63d6ed3 100644 (file)
--- a/relay/Makefile.in
+++ b/relay/Makefile.in
@@ -203,6 +203,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@

diff --git a/server/Makefile.in b/server/Makefile.in
index 5befd4a86e9c6014bc72bf2d30c619bd1dfb0b41..0ed0176897bb6e2df38c09e7fe60ff8a11e47436 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -264,6 +264,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@

diff --git a/server/tests/Makefile.in b/server/tests/Makefile.in
index 1256630b0847be726b026bcd2755d14114cca3c5..a0e744b28ff15aa6b26ee1905d1535299542faa0 100644 (file)
--- a/server/tests/Makefile.in
+++ b/server/tests/Makefile.in
@@ -270,6 +270,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 49ad15c0363fe6d36d804eb6412b73aa0ce953f9..195055fb74b67c5a8045ba5181aec20848ce4a69 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -174,6 +174,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@