Solved the --with-libbind vs distchek issue

diff --git a/Makefile.am b/Makefile.am
index 5342d6498bdeb409d99c0fa96c3a0845932f3454..caea8833a43c917d2e75ec010c76d37cabcb16f9 100644 (file)
--- 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 c482bf0b6403af7e603a1b4f22e5b321d72c3d56..5166446c09d375005be2f4c0d913c15c62ef51a3 100644 (file)
--- 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 88c098441b7e109c52b145782264dcf60f4f8078..c2ac84489462fadd9beb69724f03f0570065c128 100644 (file)
--- 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 e19ae3092adf2211d91d973ab03ca3aa5f45ad9b..fef932e0d82d64cdd44069ce3587caeb5fac1e7e 100644 (file)
--- 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 782fd70585f9522ee80bf685fd653d1bfe6b6aa2..e4d09ef4462b93570bd422fd77c4bdf7a505623f 100644 (file)
--- 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 2b668a83bf1fff712241759cbfd3a38645f339b6..18e71be1093f8995ee20eefb97563f4c0d28b61b 100644 (file)
--- 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@

diff --git a/configure b/configure
index cf533b5439d5b9f853349ec105ca24474231d08b..975ec212bc10ca4214a63968d3d0c2e493a40d56 100755 (executable)
--- a/configure
+++ b/configure
@@ -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 46d5627505092b4357058a8098998c5c0846fe83..94cde26df218ddacaa1e915a9170cb54276ef126 100644 (file)
--- 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 1d8b04b616b4b4774e5fd848dae532be1f792164..8f86da9fb5d6acb7885ccac95ed86689888688a1 100644 (file)
--- 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 0050031b7b9e85ce87a62cfcd431431d12c7cce3..ab2bf68b150bb3e98000b7d180f142d59f6c91e1 100644 (file)
--- 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 41bcf5b233364f1a97e8f0e2d4158271a773eb7f..e41c3fcb62ef7e6a5197b0257c81af5eb6f8229c 100644 (file)
--- 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 d46b27d88272447c7d916a55a483f88ad0017451..aa6cd5776e67ece80126e41ba126b7dc467ce9d9 100644 (file)
--- 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 022512b3ebb8d0bcd150821ab4695ee2df33d81c..feac191b62ae8e1bc1081425e254afcd37c38a55 100644 (file)
--- 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 92a2a49ee47cd3b685cf8192a104ba4db3984dc7..b91838991ed70a5b35df75d9430de3101be6bcc9 100644 (file)
--- 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 c8af0e523f5f1e6a8995f9589d9081b74360ec3e..60cd1946fe88641dfdf51c9fc8f776ed3a4ad522 100644 (file)
--- 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@