diff options
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | Makefile.in | 49 | ||||
| -rw-r--r-- | client/Makefile.in | 1 | ||||
| -rw-r--r-- | client/tests/Makefile.in | 1 | ||||
| -rw-r--r-- | common/Makefile.in | 1 | ||||
| -rw-r--r-- | common/tests/Makefile.in | 1 | ||||
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | dhcpctl/Makefile.in | 1 | ||||
| -rw-r--r-- | includes/Makefile.in | 1 | ||||
| -rw-r--r-- | omapip/Makefile.in | 1 | ||||
| -rw-r--r-- | relay/Makefile.in | 1 | ||||
| -rw-r--r-- | server/Makefile.in | 1 | ||||
| -rw-r--r-- | server/tests/Makefile.in | 1 | ||||
| -rw-r--r-- | tests/Makefile.in | 1 |
15 files changed, 70 insertions, 24 deletions
diff --git a/Makefile.am b/Makefile.am index 5342d649..caea8833 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,9 +23,14 @@ EXTRA_DIST = RELNOTES LICENSE \ doc/devel/arch.dox doc/devel/atf.dox doc/devel/contrib.dox \ doc/devel/debug.dox doc/devel/isc-logo.jpg doc/devel/mainpage.dox \ doc/devel/omapi.dox doc/devel/qa.dox \ - bind/Makefile.in bind/bind.tar.gz bind/version.tmp \ common/tests/Atffile server/tests/Atffile +if HAVE_BINDDIR +EXTRA_DIST += bind/Makefile.in bind/bind.tar.gz bind/version.tmp +endif + +# Use an autoconf substitution vs an automake conditional here +# to fool automake when the bind directory does not exist. SUBDIRS = @BINDSUBDIR@ includes tests common omapip client dhcpctl relay server nobase_include_HEADERS = dhcpctl/dhcpctl.h @@ -34,10 +39,13 @@ nobase_include_HEADERS = dhcpctl/dhcpctl.h # distcheck tuning # -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_ATF_CONFIGURE_FLAG@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_ATF_CONFIGURE_FLAG@ +DISTCHECK_CONFIGURE_FLAGS += @DISTCHECK_LIBBIND_CONFIGURE_FLAG@ distcheck-hook: +if HAVE_BINDDIR chmod u+w $(distdir)/bind +endif distclean-local: rm -f config.report diff --git a/Makefile.in b/Makefile.in index c482bf0b..5166446c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -88,6 +88,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@HAVE_BINDDIR_TRUE@am__append_1 = bind/Makefile.in bind/bind.tar.gz bind/version.tmp subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -261,6 +262,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@ +DISTCHECK_LIBBIND_CONFIGURE_FLAG = @DISTCHECK_LIBBIND_CONFIGURE_FLAG@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -352,33 +354,36 @@ top_srcdir = @top_srcdir@ # # We have a lot of files that we want shipped with the distribution. # -EXTRA_DIST = RELNOTES LICENSE \ - contrib/3.0b1-lease-convert contrib/dhclient-tz-exithook.sh \ - contrib/dhcp.spec contrib/sethostname.sh contrib/solaris.init \ - contrib/ms2isc/Registry.pm contrib/ms2isc/ms2isc.pl \ - contrib/ms2isc/readme.txt contrib/ldap/dhcpd-conf-to-ldap \ - contrib/ldap/dhcp.schema contrib/ldap/README.ldap \ - contrib/dhcp-lease-list.pl \ - doc/DHCPv4-over-DHCPv6 \ - doc/IANA-arp-parameters doc/Makefile doc/References.html \ - doc/References.txt doc/References.xml doc/api+protocol \ - doc/ja_JP.eucJP/dhclient-script.8 doc/ja_JP.eucJP/dhclient.8 \ - doc/ja_JP.eucJP/dhclient.conf.5 doc/ja_JP.eucJP/dhclient.leases.5 \ - doc/ja_JP.eucJP/dhcp-eval.5 doc/ja_JP.eucJP/dhcp-options.5 \ - doc/examples/dhclient-dhcpv6.conf doc/examples/dhcpd-dhcpv6.conf \ - doc/devel/arch.dox doc/devel/atf.dox doc/devel/contrib.dox \ - doc/devel/debug.dox doc/devel/isc-logo.jpg doc/devel/mainpage.dox \ - doc/devel/omapi.dox doc/devel/qa.dox \ - bind/Makefile.in bind/bind.tar.gz bind/version.tmp \ - common/tests/Atffile server/tests/Atffile - +EXTRA_DIST = RELNOTES LICENSE contrib/3.0b1-lease-convert \ + contrib/dhclient-tz-exithook.sh contrib/dhcp.spec \ + contrib/sethostname.sh contrib/solaris.init \ + contrib/ms2isc/Registry.pm contrib/ms2isc/ms2isc.pl \ + contrib/ms2isc/readme.txt contrib/ldap/dhcpd-conf-to-ldap \ + contrib/ldap/dhcp.schema contrib/ldap/README.ldap \ + contrib/dhcp-lease-list.pl doc/DHCPv4-over-DHCPv6 \ + doc/IANA-arp-parameters doc/Makefile doc/References.html \ + doc/References.txt doc/References.xml doc/api+protocol \ + doc/ja_JP.eucJP/dhclient-script.8 doc/ja_JP.eucJP/dhclient.8 \ + doc/ja_JP.eucJP/dhclient.conf.5 \ + doc/ja_JP.eucJP/dhclient.leases.5 doc/ja_JP.eucJP/dhcp-eval.5 \ + doc/ja_JP.eucJP/dhcp-options.5 \ + doc/examples/dhclient-dhcpv6.conf \ + doc/examples/dhcpd-dhcpv6.conf doc/devel/arch.dox \ + doc/devel/atf.dox doc/devel/contrib.dox doc/devel/debug.dox \ + doc/devel/isc-logo.jpg doc/devel/mainpage.dox \ + doc/devel/omapi.dox doc/devel/qa.dox common/tests/Atffile \ + server/tests/Atffile $(am__append_1) + +# Use an autoconf substitution vs an automake conditional here +# to fool automake when the bind directory does not exist. SUBDIRS = @BINDSUBDIR@ includes tests common omapip client dhcpctl relay server nobase_include_HEADERS = dhcpctl/dhcpctl.h # # distcheck tuning # -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_ATF_CONFIGURE_FLAG@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_ATF_CONFIGURE_FLAG@ \ + @DISTCHECK_LIBBIND_CONFIGURE_FLAG@ $(am__empty) all: all-recursive .SUFFIXES: @@ -864,7 +869,7 @@ uninstall-am: uninstall-nobase_includeHEADERS Makefile: distcheck-hook: - chmod u+w $(distdir)/bind +@HAVE_BINDDIR_TRUE@ chmod u+w $(distdir)/bind distclean-local: rm -f config.report diff --git a/client/Makefile.in b/client/Makefile.in index 88c09844..c2ac8448 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -269,6 +269,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@ +DISTCHECK_LIBBIND_CONFIGURE_FLAG = @DISTCHECK_LIBBIND_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 e19ae309..fef932e0 100644 --- a/client/tests/Makefile.in +++ b/client/tests/Makefile.in @@ -241,6 +241,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@ +DISTCHECK_LIBBIND_CONFIGURE_FLAG = @DISTCHECK_LIBBIND_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 782fd705..e4d09ef4 100644 --- a/common/Makefile.in +++ b/common/Makefile.in @@ -275,6 +275,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@ +DISTCHECK_LIBBIND_CONFIGURE_FLAG = @DISTCHECK_LIBBIND_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 2b668a83..18e71be1 100644 --- a/common/tests/Makefile.in +++ b/common/tests/Makefile.in @@ -283,6 +283,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@ +DISTCHECK_LIBBIND_CONFIGURE_FLAG = @DISTCHECK_LIBBIND_CONFIGURE_FLAG@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -627,6 +627,9 @@ LTLIBOBJS LIBOBJS LDAP_CFLAGS LDAP_LIBS +HAVE_BINDDIR_FALSE +HAVE_BINDDIR_TRUE +DISTCHECK_LIBBIND_CONFIGURE_FLAG BINDLIBISCDIR BINDLIBISCCFGDIR BINDLIBDNSDIR @@ -6907,6 +6910,7 @@ BINDLIBIRSDIR= BINDLIBDNSDIR= BINDLIBISCCFGDIR= BINDLIBISCDIR= +DISTCHECK_LIBBIND_CONFIGURE_FLAG= # Check whether --with-libbind was given. if test "${with_libbind+set}" = set; then : @@ -6959,6 +6963,7 @@ no) BINDLIBDNSDIR="$BINDDIR/lib" BINDLIBISCCFGDIR="$BINDDIR/lib" BINDLIBISCDIR="$BINDDIR/lib" + DISTCHECK_LIBBIND_CONFIGURE_FLAG="--with-libbind=$use_libbind" ;; esac @@ -6969,6 +6974,15 @@ esac + if test "$use_libbind" = "no"; then + HAVE_BINDDIR_TRUE= + HAVE_BINDDIR_FALSE='#' +else + HAVE_BINDDIR_TRUE='#' + HAVE_BINDDIR_FALSE= +fi + + # OpenLDAP support. # Check whether --with-ldap was given. @@ -7498,6 +7512,10 @@ if test -z "${HAVE_ATF_TRUE}" && test -z "${HAVE_ATF_FALSE}"; then as_fn_error $? "conditional \"HAVE_ATF\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_BINDDIR_TRUE}" && test -z "${HAVE_BINDDIR_FALSE}"; then + as_fn_error $? "conditional \"HAVE_BINDDIR\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/configure.ac b/configure.ac index 46d56275..94cde26d 100644 --- a/configure.ac +++ b/configure.ac @@ -738,6 +738,7 @@ BINDLIBIRSDIR= BINDLIBDNSDIR= BINDLIBISCCFGDIR= BINDLIBISCDIR= +DISTCHECK_LIBBIND_CONFIGURE_FLAG= AC_ARG_WITH(libbind, AS_HELP_STRING([--with-libbind=PATH],[bind includes and libraries are in PATH]), use_libbind="$withval", use_libbind="no") @@ -784,6 +785,7 @@ no) BINDLIBDNSDIR="$BINDDIR/lib" BINDLIBISCCFGDIR="$BINDDIR/lib" BINDLIBISCDIR="$BINDDIR/lib" + DISTCHECK_LIBBIND_CONFIGURE_FLAG="--with-libbind=$use_libbind" ;; esac AC_SUBST(BINDSUBDIR) @@ -793,6 +795,8 @@ AC_SUBST(BINDLIBIRSDIR) AC_SUBST(BINDLIBDNSDIR) AC_SUBST(BINDLIBISCCFGDIR) AC_SUBST(BINDLIBISCDIR) +AC_SUBST(DISTCHECK_LIBBIND_CONFIGURE_FLAG) +AM_CONDITIONAL(HAVE_BINDDIR, test "$use_libbind" = "no") # OpenLDAP support. AC_ARG_WITH(ldap, diff --git a/dhcpctl/Makefile.in b/dhcpctl/Makefile.in index 1d8b04b6..8f86da9f 100644 --- a/dhcpctl/Makefile.in +++ b/dhcpctl/Makefile.in @@ -244,6 +244,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@ +DISTCHECK_LIBBIND_CONFIGURE_FLAG = @DISTCHECK_LIBBIND_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 0050031b..ab2bf68b 100644 --- a/includes/Makefile.in +++ b/includes/Makefile.in @@ -198,6 +198,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@ +DISTCHECK_LIBBIND_CONFIGURE_FLAG = @DISTCHECK_LIBBIND_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 41bcf5b2..e41c3fcb 100644 --- a/omapip/Makefile.in +++ b/omapip/Makefile.in @@ -239,6 +239,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@ +DISTCHECK_LIBBIND_CONFIGURE_FLAG = @DISTCHECK_LIBBIND_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 d46b27d8..aa6cd577 100644 --- a/relay/Makefile.in +++ b/relay/Makefile.in @@ -221,6 +221,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@ +DISTCHECK_LIBBIND_CONFIGURE_FLAG = @DISTCHECK_LIBBIND_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 022512b3..feac191b 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -285,6 +285,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@ +DISTCHECK_LIBBIND_CONFIGURE_FLAG = @DISTCHECK_LIBBIND_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 92a2a49e..b9183899 100644 --- a/server/tests/Makefile.in +++ b/server/tests/Makefile.in @@ -301,6 +301,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@ +DISTCHECK_LIBBIND_CONFIGURE_FLAG = @DISTCHECK_LIBBIND_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 c8af0e52..60cd1946 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -192,6 +192,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISTCHECK_ATF_CONFIGURE_FLAG = @DISTCHECK_ATF_CONFIGURE_FLAG@ +DISTCHECK_LIBBIND_CONFIGURE_FLAG = @DISTCHECK_LIBBIND_CONFIGURE_FLAG@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ |