From: Francis Dupont Date: Sat, 18 Apr 2015 08:08:26 +0000 (+0200) Subject: regen X-Git-Tag: v4_3_4~23^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2d20b9e7accef90b0f996fb0ed07168770ccf19;p=thirdparty%2Fdhcp.git regen --- diff --git a/Makefile.in b/Makefile.in index 38a7f1e6a..d65dd6efc 100644 --- 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 af0a58e0e..0ec552fbd 100644 --- 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 2195e9285..bd0856d2c 100644 --- 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 dff400fd0..89635a85f 100644 --- 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 d91d81367..432fcdcac 100644 --- 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 936660bca..1b74d509a 100755 --- 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 1894aa4da..6d0d22fbd 100644 --- 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 bb74d1088..ba1db6011 100644 --- 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 0c0a2bc3e..11294de31 100644 --- 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 134e1cbc0..fa1897e26 100644 --- 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 5befd4a86..0ed017689 100644 --- 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 1256630b0..a0e744b28 100644 --- 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 49ad15c03..195055fb7 100644 --- 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@