From: Francis Dupont Date: Fri, 17 Apr 2015 12:53:46 +0000 (+0200) Subject: regen X-Git-Tag: v4_3_4~23^2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fb9c8a1a27f0ae78da3e475e5c4f1eac46e3f24;p=thirdparty%2Fdhcp.git regen --- diff --git a/Makefile.in b/Makefile.in index 8ce8974c8..87b208926 100644 --- a/Makefile.in +++ b/Makefile.in @@ -233,6 +233,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ diff --git a/client/Makefile.in b/client/Makefile.in index 72fce7c80..248185a8b 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -98,8 +98,8 @@ am_dhclient_OBJECTS = clparse.$(OBJEXT) dhclient.$(OBJEXT) \ dhc6.$(OBJEXT) dhclient_OBJECTS = $(am_dhclient_OBJECTS) dhclient_DEPENDENCIES = ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a + $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ + $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -240,6 +240,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -339,14 +340,15 @@ top_srcdir = @top_srcdir@ # directory. That eliminates any discrepancies between tested code and # production code. Sadly, we are not there yet. SUBDIRS = . tests +BINDLIBDIR = @BINDDIR@/lib dist_sysconf_DATA = dhclient.conf.example dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ scripts/netbsd scripts/nextstep scripts/openbsd \ scripts/solaris scripts/openwrt -dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../bind/lib/libirs.a \ - ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a +dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ + $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 EXTRA_DIST = $(man_MANS) diff --git a/client/tests/Makefile.in b/client/tests/Makefile.in index 303eb130c..cab19812a 100644 --- a/client/tests/Makefile.in +++ b/client/tests/Makefile.in @@ -213,6 +213,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -307,15 +308,16 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = . +BINDLIBDIR = @BINDDIR@/lib AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes \ -I$(top_srcdir)/bind/include -I$(top_srcdir) \ -DLOCALSTATEDIR='"."' -DCLIENT_PATH='"."' EXTRA_DIST = Atffile duid0_test.txt duid1_test.txt duid2_test.txt duid3_test.txt DHCPSRC = ../clparse.c ../dhc6.c ../dhclient.c DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \ - $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/bind/lib/libirs.a \ - $(top_builddir)/bind/lib/libdns.a $(top_builddir)/bind/lib/libisccfg.a \ - $(top_builddir)/bind/lib/libisc.a + $(top_builddir)/dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \ + $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \ + $(BINDLIBDIR)/libisc.a ATF_TESTS = $(am__append_1) @HAVE_ATF_TRUE@duid_unittests_SOURCES = $(DHCPSRC) duid_unittest.c diff --git a/common/Makefile.in b/common/Makefile.in index ade60f17a..b176b7df8 100644 --- a/common/Makefile.in +++ b/common/Makefile.in @@ -247,6 +247,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ diff --git a/common/tests/Makefile.in b/common/tests/Makefile.in index 8fdddf636..d373d29cd 100644 --- a/common/tests/Makefile.in +++ b/common/tests/Makefile.in @@ -102,9 +102,9 @@ alloc_unittest_OBJECTS = $(am_alloc_unittest_OBJECTS) am__DEPENDENCIES_1 = @HAVE_ATF_TRUE@alloc_unittest_DEPENDENCIES = $(am__DEPENDENCIES_1) \ @HAVE_ATF_TRUE@ ../libdhcp.a ../../omapip/libomapi.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libirs.a ../../bind/lib/libdns.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisccfg.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisc.a +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisccfg.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisc.a am__dns_unittest_SOURCES_DIST = dns_unittest.c \ $(top_srcdir)/tests/t_api_dhcp.c @HAVE_ATF_TRUE@am_dns_unittest_OBJECTS = dns_unittest.$(OBJEXT) \ @@ -112,9 +112,9 @@ am__dns_unittest_SOURCES_DIST = dns_unittest.c \ dns_unittest_OBJECTS = $(am_dns_unittest_OBJECTS) @HAVE_ATF_TRUE@dns_unittest_DEPENDENCIES = $(am__DEPENDENCIES_1) \ @HAVE_ATF_TRUE@ ../libdhcp.a ../../omapip/libomapi.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libirs.a ../../bind/lib/libdns.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisccfg.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisc.a +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisccfg.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisc.a am__misc_unittest_SOURCES_DIST = misc_unittest.c \ $(top_srcdir)/tests/t_api_dhcp.c @HAVE_ATF_TRUE@am_misc_unittest_OBJECTS = misc_unittest.$(OBJEXT) \ @@ -122,9 +122,9 @@ am__misc_unittest_SOURCES_DIST = misc_unittest.c \ misc_unittest_OBJECTS = $(am_misc_unittest_OBJECTS) @HAVE_ATF_TRUE@misc_unittest_DEPENDENCIES = $(am__DEPENDENCIES_1) \ @HAVE_ATF_TRUE@ ../libdhcp.a ../../omapip/libomapi.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libirs.a ../../bind/lib/libdns.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisccfg.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisc.a +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisccfg.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisc.a am__ns_name_unittest_SOURCES_DIST = ns_name_test.c \ $(top_srcdir)/tests/t_api_dhcp.c @HAVE_ATF_TRUE@am_ns_name_unittest_OBJECTS = ns_name_test.$(OBJEXT) \ @@ -132,9 +132,9 @@ am__ns_name_unittest_SOURCES_DIST = ns_name_test.c \ ns_name_unittest_OBJECTS = $(am_ns_name_unittest_OBJECTS) @HAVE_ATF_TRUE@ns_name_unittest_DEPENDENCIES = $(am__DEPENDENCIES_1) \ @HAVE_ATF_TRUE@ ../libdhcp.a ../../omapip/libomapi.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libirs.a ../../bind/lib/libdns.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisccfg.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisc.a +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisccfg.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisc.a AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -251,6 +251,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -345,33 +346,34 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = . +BINDLIBDIR = @BINDDIR@/lib AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes EXTRA_DIST = Atffile ATF_TESTS = $(am__append_1) @HAVE_ATF_TRUE@alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c @HAVE_ATF_TRUE@alloc_unittest_LDADD = $(ATF_LDFLAGS) ../libdhcp.a \ -@HAVE_ATF_TRUE@ ../../omapip/libomapi.a ../../bind/lib/libirs.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libdns.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisccfg.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisc.a +@HAVE_ATF_TRUE@ ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libdns.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisccfg.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisc.a @HAVE_ATF_TRUE@dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c @HAVE_ATF_TRUE@dns_unittest_LDADD = $(ATF_LDFLAGS) ../libdhcp.a \ -@HAVE_ATF_TRUE@ ../../omapip/libomapi.a ../../bind/lib/libirs.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libdns.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisccfg.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisc.a +@HAVE_ATF_TRUE@ ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libdns.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisccfg.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisc.a @HAVE_ATF_TRUE@misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c @HAVE_ATF_TRUE@misc_unittest_LDADD = $(ATF_LDFLAGS) ../libdhcp.a \ -@HAVE_ATF_TRUE@ ../../omapip/libomapi.a ../../bind/lib/libirs.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libdns.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisccfg.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisc.a +@HAVE_ATF_TRUE@ ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libdns.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisccfg.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisc.a @HAVE_ATF_TRUE@ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c @HAVE_ATF_TRUE@ns_name_unittest_LDADD = $(ATF_LDFLAGS) ../libdhcp.a \ -@HAVE_ATF_TRUE@ ../../omapip/libomapi.a ../../bind/lib/libirs.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libdns.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisccfg.a \ -@HAVE_ATF_TRUE@ ../../bind/lib/libisc.a +@HAVE_ATF_TRUE@ ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libdns.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisccfg.a \ +@HAVE_ATF_TRUE@ $(BINDLIBDIR)/libisc.a all: all-recursive .SUFFIXES: diff --git a/configure b/configure index 72862d21c..cc7e7b23a 100755 --- a/configure +++ b/configure @@ -626,6 +626,7 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS LDAP_CFLAGS +BINDDIR ac_prefix_program HAVE_ATF_FALSE HAVE_ATF_TRUE @@ -6613,7 +6614,7 @@ $as_echo "#define VLAN_TCI_PRESENT 1" >>confdefs.h fi -libbind= +BINDDIR= # Check whether --with-libbind was given. if test "${with_libbind+set}" = set; then : @@ -6624,20 +6625,26 @@ fi case "$use_libbind" in yes) - libbind="\${top_srcdir}/bind" + BINDDIR="\${top_srcdir}/bind" ;; no) - libbind="\${top_srcdir}/bind" + BINDDIR="\${top_srcdir}/bind" ;; *) - libbind="$use_libbind" + BINDDIR="$use_libbind" if test ! -d "bind"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: empty bind directory" >&5 -$as_echo "$as_me: WARNING: empty bind directory" >&2;} + # no bind directory, create it with a fake Makefile.in + mkdir bind + cat > bind/Makefile.in << EOF +# placeholder +all check clean distclean distdir install uninstall: + +EOF fi ;; esac + # OpenLDAP support. # Check whether --with-ldap was given. @@ -6799,7 +6806,7 @@ fi CFLAGS="$CFLAGS $STD_CWARNINGS" # Try to add the bind include directory -CFLAGS="$CFLAGS -I$libbind/include" +CFLAGS="$CFLAGS -I$BINDDIR/include" case "$host" in *-darwin*) diff --git a/dhcpctl/Makefile.in b/dhcpctl/Makefile.in index 0141b7482..951017e6f 100644 --- a/dhcpctl/Makefile.in +++ b/dhcpctl/Makefile.in @@ -137,13 +137,15 @@ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am_cltest_OBJECTS = cltest.$(OBJEXT) cltest_OBJECTS = $(am_cltest_OBJECTS) cltest_DEPENDENCIES = libdhcpctl.a ../common/libdhcp.a \ - ../omapip/libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a + ../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ + $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \ + $(BINDLIBDIR)/libisc.a am_omshell_OBJECTS = omshell.$(OBJEXT) omshell_OBJECTS = $(am_omshell_OBJECTS) omshell_DEPENDENCIES = libdhcpctl.a ../common/libdhcp.a \ - ../omapip/libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a + ../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ + $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \ + $(BINDLIBDIR)/libisc.a AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -215,6 +217,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -308,19 +311,20 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +BINDLIBDIR = @BINDDIR@/lib lib_LIBRARIES = libdhcpctl.a man_MANS = omshell.1 dhcpctl.3 EXTRA_DIST = $(man_MANS) omshell_SOURCES = omshell.c omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a + $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ + $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c cltest_SOURCES = cltest.c cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a + $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ + $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a all: all-am diff --git a/includes/Makefile.in b/includes/Makefile.in index 45c318896..86ef3245e 100644 --- a/includes/Makefile.in +++ b/includes/Makefile.in @@ -169,6 +169,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ diff --git a/omapip/Makefile.in b/omapip/Makefile.in index 6086e9f05..e7a6c3350 100644 --- a/omapip/Makefile.in +++ b/omapip/Makefile.in @@ -140,9 +140,9 @@ libomapi_a_OBJECTS = $(am_libomapi_a_OBJECTS) PROGRAMS = $(noinst_PROGRAMS) am_svtest_OBJECTS = test.$(OBJEXT) svtest_OBJECTS = $(am_svtest_OBJECTS) -svtest_DEPENDENCIES = libomapi.a ../bind/lib/libirs.a \ - ../bind/lib/libdns.a ../bind/lib/libisccfg.a \ - ../bind/lib/libisc.a +svtest_DEPENDENCIES = libomapi.a $(BINDLIBDIR)/libirs.a \ + $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \ + $(BINDLIBDIR)/libisc.a AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -212,6 +212,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -305,6 +306,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +BINDLIBDIR = @BINDDIR@/lib lib_LIBRARIES = libomapi.a libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ errwarn.c listener.c dispatch.c generic.c support.c \ @@ -314,8 +316,8 @@ libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ man_MANS = omapi.3 EXTRA_DIST = $(man_MANS) svtest_SOURCES = test.c -svtest_LDADD = libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a +svtest_LDADD = libomapi.a $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ + $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a all: all-am diff --git a/relay/Makefile.in b/relay/Makefile.in index 5d9f98597..816cf6a13 100644 --- a/relay/Makefile.in +++ b/relay/Makefile.in @@ -95,8 +95,8 @@ PROGRAMS = $(sbin_PROGRAMS) am_dhcrelay_OBJECTS = dhcrelay.$(OBJEXT) dhcrelay_OBJECTS = $(am_dhcrelay_OBJECTS) dhcrelay_DEPENDENCIES = ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a + $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ + $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -193,6 +193,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -286,11 +287,12 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +BINDLIBDIR = @BINDDIR@/lib AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' dhcrelay_SOURCES = dhcrelay.c dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a + $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ + $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) diff --git a/server/Makefile.in b/server/Makefile.in index 939e47eec..7a5395d07 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -105,9 +105,9 @@ am_dhcpd_OBJECTS = dhcpd-dhcpd.$(OBJEXT) dhcpd-dhcp.$(OBJEXT) \ dhcpd-ldap_casa.$(OBJEXT) dhcpd_OBJECTS = $(am_dhcpd_OBJECTS) dhcpd_DEPENDENCIES = ../common/libdhcp.a ../omapip/libomapi.a \ - ../dhcpctl/libdhcpctl.a ../bind/lib/libirs.a \ - ../bind/lib/libdns.a ../bind/lib/libisccfg.a \ - ../bind/lib/libisc.a + ../dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \ + $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \ + $(BINDLIBDIR)/libisc.a dhcpd_LINK = $(CCLD) $(dhcpd_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -254,6 +254,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -353,6 +354,7 @@ top_srcdir = @top_srcdir@ # directory. That eliminates any discrepancies between tested code and # production code. Sadly, we are not there yet. SUBDIRS = . tests +BINDLIBDIR = @BINDDIR@/lib AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' dist_sysconf_DATA = dhcpd.conf.example dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ @@ -361,8 +363,9 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ dhcpd_CFLAGS = $(LDAP_CFLAGS) dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ - ../dhcpctl/libdhcpctl.a ../bind/lib/libirs.a \ - ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a + ../dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \ + $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \ + $(BINDLIBDIR)/libisc.a man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 EXTRA_DIST = $(man_MANS) diff --git a/server/tests/Makefile.in b/server/tests/Makefile.in index a103666ef..089254bd0 100644 --- a/server/tests/Makefile.in +++ b/server/tests/Makefile.in @@ -260,6 +260,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -354,6 +355,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = . +BINDLIBDIR = @BINDDIR@/lib AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes \ -I$(top_srcdir)/bind/include -I$(top_srcdir) \ -DLOCALSTATEDIR='"."' @@ -363,10 +365,10 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c \ ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \ ../ldap.c ../ldap_casa.c ../dhcpd.c -DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \ - $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/bind/lib/libirs.a \ - $(top_builddir)/bind/lib/libdns.a $(top_builddir)/bind/lib/libisccfg.a \ - $(top_builddir)/bind/lib/libisc.a +DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \ + $(top_builddir)/dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \ + $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \ + $(BINDLIBDIR)/libisc.a ATF_TESTS = $(am__append_1) @HAVE_ATF_TRUE@dhcpd_unittests_SOURCES = $(DHCPSRC) simple_unittest.c diff --git a/tests/Makefile.in b/tests/Makefile.in index 64297ae4e..26c46c46d 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -164,6 +164,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@