Finished rebased

diff --git a/Makefile.am b/Makefile.am
index 2371e1de926bb136e9c15c3de51ddc389cf8d649..5342d6498bdeb409d99c0fa96c3a0845932f3454 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_DIST = RELNOTES LICENSE \
             bind/Makefile.in bind/bind.tar.gz bind/version.tmp \
             common/tests/Atffile server/tests/Atffile
 
-SUBDIRS = @BINDSRCDIR@ includes tests common omapip client dhcpctl relay server
+SUBDIRS = @BINDSUBDIR@ includes tests common omapip client dhcpctl relay server
 
 nobase_include_HEADERS = dhcpctl/dhcpctl.h
 

diff --git a/Makefile.in b/Makefile.in
index 2dac656d45a238ec0dc2dd37cd609dd59aa26a55..c482bf0b6403af7e603a1b4f22e5b321d72c3d56 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -245,7 +245,13 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BINDCONFIG = @BINDCONFIG@
 BINDDIR = @BINDDIR@
+BINDIOMUX = @BINDIOMUX@
+BINDLIBDNSDIR = @BINDLIBDNSDIR@
+BINDLIBIRSDIR = @BINDLIBIRSDIR@
+BINDLIBISCCFGDIR = @BINDLIBISCCFGDIR@
+BINDLIBISCDIR = @BINDLIBISCDIR@
 BINDSRCDIR = @BINDSRCDIR@
+BINDSUBDIR = @BINDSUBDIR@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -366,7 +372,7 @@ EXTRA_DIST = RELNOTES LICENSE \
             bind/Makefile.in bind/bind.tar.gz bind/version.tmp \
             common/tests/Atffile server/tests/Atffile
 
-SUBDIRS = @BINDSRCDIR@ includes tests common omapip client dhcpctl relay server
+SUBDIRS = @BINDSUBDIR@ includes tests common omapip client dhcpctl relay server
 nobase_include_HEADERS = dhcpctl/dhcpctl.h
 
 #

diff --git a/RELNOTES b/RELNOTES
index c7f588802e1fb6f6f7d98bb4b77f0127f0f3f920..568f75ee02d02c2e5b2a7db9ff2868876de12399 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -103,6 +103,10 @@ by Eric Young (eay@cryptsoft.com).
   bind/bind9 and then invoke the util/bind.sh script as usual.
   [ISC-Bugs #43236]
 
+- Use the embedded bind libraries where they are built (vs where they
+  are installed).
+  [ISC-Bugs #39319]
+
                        Changes since 4.3.0 (bug fixes)
 
 - Tidy up several small tickets.

diff --git a/client/Makefile.am b/client/Makefile.am
index 2cb83d809b3ffecbbf0c1b7cf4096b3ff25eb722..4730536f9af0ec3695596fba6922e6f5f4129767 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -4,10 +4,8 @@
 # production code. Sadly, we are not there yet.
 SUBDIRS = . tests
 
-BINDLIBDIR = @BINDDIR@/lib
-
-AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
-             -DLOCALSTATEDIR='"$(localstatedir)"'
+AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"'
+AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"'
 
 dist_sysconf_DATA = dhclient.conf.example
 sbin_PROGRAMS = dhclient
@@ -15,7 +13,10 @@ 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 $(BINDLIBDIR)/libirs.a \
-                $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+                @BINDLIBIRSDIR@/libirs.a \
+                @BINDLIBDNSDIR@/libdns.a \
+                @BINDLIBISCCFGDIR@/libisccfg.a \
+                @BINDLIBISCDIR@/libisc.a
 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
 EXTRA_DIST = $(man_MANS)

diff --git a/client/Makefile.in b/client/Makefile.in
index 59597f0f81d6e21b4185e6010ef28a93f2a37f23..88c098441b7e109c52b145782264dcf60f4f8078 100644 (file)
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -108,8 +108,8 @@ am_dhclient_OBJECTS = clparse.$(OBJEXT) dhclient.$(OBJEXT) \
        dhc6.$(OBJEXT)
 dhclient_OBJECTS = $(am_dhclient_OBJECTS)
 dhclient_DEPENDENCIES = ../common/libdhcp.a ../omapip/libomapi.a \
-       $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
-       $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
+       @BINDLIBIRSDIR@/libirs.a @BINDLIBDNSDIR@/libdns.a \
+       @BINDLIBISCCFGDIR@/libisccfg.a @BINDLIBISCDIR@/libisc.a
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -253,7 +253,13 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BINDCONFIG = @BINDCONFIG@
 BINDDIR = @BINDDIR@
+BINDIOMUX = @BINDIOMUX@
+BINDLIBDNSDIR = @BINDLIBDNSDIR@
+BINDLIBIRSDIR = @BINDLIBIRSDIR@
+BINDLIBISCCFGDIR = @BINDLIBISCCFGDIR@
+BINDLIBISCDIR = @BINDLIBISCDIR@
 BINDSRCDIR = @BINDSRCDIR@
+BINDSUBDIR = @BINDSUBDIR@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -356,18 +362,19 @@ 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 = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
-             -DLOCALSTATEDIR='"$(localstatedir)"'
-
+       -DLOCALSTATEDIR='"$(localstatedir)"'
 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 $(BINDLIBDIR)/libirs.a \
-                $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+                @BINDLIBIRSDIR@/libirs.a \
+                @BINDLIBDNSDIR@/libdns.a \
+                @BINDLIBISCCFGDIR@/libisccfg.a \
+                @BINDLIBISCDIR@/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.am b/client/tests/Makefile.am
index 5031d0c542a12a7eec1e0bd799c87458ed23fc84..4fe26fb0a182693a0af61dc06a0bfccdff87d8f4 100644 (file)
--- a/client/tests/Makefile.am
+++ b/client/tests/Makefile.am
@@ -1,7 +1,5 @@
 SUBDIRS = .
 
-BINDLIBDIR = @BINDDIR@/lib
-
 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
 AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
 AM_CPPFLAGS += -DLOCALSTATEDIR='"."'
@@ -17,10 +15,13 @@ info:
 
 DHCPSRC = ../clparse.c ../dhc6.c ../dhclient.c
 
-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
+DHCPLIBS = $(top_builddir)/common/libdhcp.a \
+         $(top_builddir)/omapip/libomapi.a    \
+          $(top_builddir)/dhcpctl/libdhcpctl.a \
+         @BINDLIBIRSDIR@/libirs.a \
+         @BINDLIBDNSDIR@/libdns.a \
+         @BINDLIBISCCFGDIR@/libisccfg.a \
+         @BINDLIBISCDIR@/libisc.a
 
 ATF_TESTS =
 if HAVE_ATF

diff --git a/client/tests/Makefile.in b/client/tests/Makefile.in
index 416adddeacb4a75606d15e4c8f88bd41ba0216d1..e19ae3092adf2211d91d973ab03ca3aa5f45ad9b 100644 (file)
--- a/client/tests/Makefile.in
+++ b/client/tests/Makefile.in
@@ -225,7 +225,13 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BINDCONFIG = @BINDCONFIG@
 BINDDIR = @BINDDIR@
+BINDIOMUX = @BINDIOMUX@
+BINDLIBDNSDIR = @BINDLIBDNSDIR@
+BINDLIBIRSDIR = @BINDLIBIRSDIR@
+BINDLIBISCCFGDIR = @BINDLIBISCCFGDIR@
+BINDLIBISCDIR = @BINDLIBISCDIR@
 BINDSRCDIR = @BINDSRCDIR@
+BINDSUBDIR = @BINDSUBDIR@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -323,16 +329,18 @@ 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@BINDDIR@/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 $(BINDLIBDIR)/libirs.a \
-         $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \
-         $(BINDLIBDIR)/libisc.a
+DHCPLIBS = $(top_builddir)/common/libdhcp.a \
+         $(top_builddir)/omapip/libomapi.a    \
+          $(top_builddir)/dhcpctl/libdhcpctl.a \
+         @BINDLIBIRSDIR@/libirs.a \
+         @BINDLIBDNSDIR@/libdns.a \
+         @BINDLIBISCCFGDIR@/libisccfg.a \
+         @BINDLIBISCDIR@/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 e78e4f7ca76fde4f81f9d27a58c86726d925d470..782fd70585f9522ee80bf685fd653d1bfe6b6aa2 100644 (file)
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -259,7 +259,13 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BINDCONFIG = @BINDCONFIG@
 BINDDIR = @BINDDIR@
+BINDIOMUX = @BINDIOMUX@
+BINDLIBDNSDIR = @BINDLIBDNSDIR@
+BINDLIBIRSDIR = @BINDLIBIRSDIR@
+BINDLIBISCCFGDIR = @BINDLIBISCCFGDIR@
+BINDLIBISCDIR = @BINDLIBISCDIR@
 BINDSRCDIR = @BINDSRCDIR@
+BINDSUBDIR = @BINDSUBDIR@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
index f6a43e42266dafb15d4b622412ce3a4542d921f0..3a49f69a133c20d44af1b00973d3123803286461 100644 (file)
--- a/common/tests/Makefile.am
+++ b/common/tests/Makefile.am
@@ -1,7 +1,5 @@
 SUBDIRS = .
 
-BINDLIBDIR = @BINDDIR@/lib
-
 AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes
 
 EXTRA_DIST = Atffile
@@ -14,27 +12,35 @@ ATF_TESTS += alloc_unittest dns_unittest misc_unittest ns_name_unittest
 
 alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
 alloc_unittest_LDADD = $(ATF_LDFLAGS)
-alloc_unittest_LDADD += ../libdhcp.a  \
-       ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
-       $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a
+alloc_unittest_LDADD += ../libdhcp.a ../../omapip/libomapi.a \
+       @BINDLIBIRSDIR@/libirs.a \
+       @BINDLIBDNSDIR@/libdns.a \
+       @BINDLIBISCCFGDIR@/libisccfg.a  \
+       @BINDLIBISCDIR@/libisc.a
 
 dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
 dns_unittest_LDADD = $(ATF_LDFLAGS)
-dns_unittest_LDADD += ../libdhcp.a  \
-       ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
-       $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a
+dns_unittest_LDADD += ../libdhcp.a ../../omapip/libomapi.a \
+       @BINDLIBIRSDIR@/libirs.a \
+       @BINDLIBDNSDIR@/libdns.a \
+       @BINDLIBISCCFGDIR@/libisccfg.a  \
+       @BINDLIBISCDIR@/libisc.a
 
 misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
 misc_unittest_LDADD = $(ATF_LDFLAGS)
-misc_unittest_LDADD += ../libdhcp.a  \
-       ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
-       $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a
+misc_unittest_LDADD += ../libdhcp.a ../../omapip/libomapi.a \
+       @BINDLIBIRSDIR@/libirs.a \
+       @BINDLIBDNSDIR@/libdns.a \
+       @BINDLIBISCCFGDIR@/libisccfg.a  \
+       @BINDLIBISCDIR@/libisc.a
 
 ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c
 ns_name_unittest_LDADD = $(ATF_LDFLAGS)
-ns_name_unittest_LDADD += ../libdhcp.a  \
-       ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
-       $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a
+ns_name_unittest_LDADD += ../libdhcp.a ../../omapip/libomapi.a \
+       @BINDLIBIRSDIR@/libirs.a \
+       @BINDLIBDNSDIR@/libdns.a \
+       @BINDLIBISCCFGDIR@/libisccfg.a  \
+       @BINDLIBISCDIR@/libisc.a
 
 check: $(ATF_TESTS)
        @if test $(top_srcdir) != ${top_builddir}; then \

diff --git a/common/tests/Makefile.in b/common/tests/Makefile.in
index 9c37fc2b0217f6e8aec370178a45c969424f7c7b..2b668a83bf1fff712241759cbfd3a38645f339b6 100644 (file)
--- a/common/tests/Makefile.in
+++ b/common/tests/Makefile.in
@@ -111,9 +111,10 @@ 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@        $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libisccfg.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libisc.a
+@HAVE_ATF_TRUE@        @BINDLIBIRSDIR@/libirs.a \
+@HAVE_ATF_TRUE@        @BINDLIBDNSDIR@/libdns.a \
+@HAVE_ATF_TRUE@        @BINDLIBISCCFGDIR@/libisccfg.a \
+@HAVE_ATF_TRUE@        @BINDLIBISCDIR@/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) \
@@ -121,9 +122,10 @@ 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@        $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libisccfg.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libisc.a
+@HAVE_ATF_TRUE@        @BINDLIBIRSDIR@/libirs.a \
+@HAVE_ATF_TRUE@        @BINDLIBDNSDIR@/libdns.a \
+@HAVE_ATF_TRUE@        @BINDLIBISCCFGDIR@/libisccfg.a \
+@HAVE_ATF_TRUE@        @BINDLIBISCDIR@/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) \
@@ -131,9 +133,10 @@ 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@        $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libisccfg.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libisc.a
+@HAVE_ATF_TRUE@        @BINDLIBIRSDIR@/libirs.a \
+@HAVE_ATF_TRUE@        @BINDLIBDNSDIR@/libdns.a \
+@HAVE_ATF_TRUE@        @BINDLIBISCCFGDIR@/libisccfg.a \
+@HAVE_ATF_TRUE@        @BINDLIBISCDIR@/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) \
@@ -141,9 +144,10 @@ 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@        $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libisccfg.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libisc.a
+@HAVE_ATF_TRUE@        @BINDLIBIRSDIR@/libirs.a \
+@HAVE_ATF_TRUE@        @BINDLIBDNSDIR@/libdns.a \
+@HAVE_ATF_TRUE@        @BINDLIBISCCFGDIR@/libisccfg.a \
+@HAVE_ATF_TRUE@        @BINDLIBISCDIR@/libisc.a
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -263,7 +267,13 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BINDCONFIG = @BINDCONFIG@
 BINDDIR = @BINDDIR@
+BINDIOMUX = @BINDIOMUX@
+BINDLIBDNSDIR = @BINDLIBDNSDIR@
+BINDLIBIRSDIR = @BINDLIBIRSDIR@
+BINDLIBISCCFGDIR = @BINDLIBISCCFGDIR@
+BINDLIBISCDIR = @BINDLIBISCDIR@
 BINDSRCDIR = @BINDSRCDIR@
+BINDSUBDIR = @BINDSUBDIR@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -361,34 +371,37 @@ 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 $(BINDLIBDIR)/libirs.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libdns.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libisccfg.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libisc.a
+@HAVE_ATF_TRUE@        ../../omapip/libomapi.a \
+@HAVE_ATF_TRUE@        @BINDLIBIRSDIR@/libirs.a \
+@HAVE_ATF_TRUE@        @BINDLIBDNSDIR@/libdns.a \
+@HAVE_ATF_TRUE@        @BINDLIBISCCFGDIR@/libisccfg.a \
+@HAVE_ATF_TRUE@        @BINDLIBISCDIR@/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 $(BINDLIBDIR)/libirs.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libdns.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libisccfg.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libisc.a
+@HAVE_ATF_TRUE@        ../../omapip/libomapi.a \
+@HAVE_ATF_TRUE@        @BINDLIBIRSDIR@/libirs.a \
+@HAVE_ATF_TRUE@        @BINDLIBDNSDIR@/libdns.a \
+@HAVE_ATF_TRUE@        @BINDLIBISCCFGDIR@/libisccfg.a \
+@HAVE_ATF_TRUE@        @BINDLIBISCDIR@/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 $(BINDLIBDIR)/libirs.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libdns.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libisccfg.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libisc.a
+@HAVE_ATF_TRUE@        ../../omapip/libomapi.a \
+@HAVE_ATF_TRUE@        @BINDLIBIRSDIR@/libirs.a \
+@HAVE_ATF_TRUE@        @BINDLIBDNSDIR@/libdns.a \
+@HAVE_ATF_TRUE@        @BINDLIBISCCFGDIR@/libisccfg.a \
+@HAVE_ATF_TRUE@        @BINDLIBISCDIR@/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 $(BINDLIBDIR)/libirs.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libdns.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libisccfg.a \
-@HAVE_ATF_TRUE@        $(BINDLIBDIR)/libisc.a
+@HAVE_ATF_TRUE@        ../../omapip/libomapi.a \
+@HAVE_ATF_TRUE@        @BINDLIBIRSDIR@/libirs.a \
+@HAVE_ATF_TRUE@        @BINDLIBDNSDIR@/libdns.a \
+@HAVE_ATF_TRUE@        @BINDLIBISCCFGDIR@/libisccfg.a \
+@HAVE_ATF_TRUE@        @BINDLIBISCDIR@/libisc.a
 all: all-recursive
 
 .SUFFIXES:

diff --git a/configure b/configure
index bb7c6b884653bd790fe852febbcc86443a53f6ca..da33ff8302b5646d55d4ae2b848601a4fd57f735 100755 (executable)
--- a/configure
+++ b/configure
@@ -627,10 +627,13 @@ LTLIBOBJS
 LIBOBJS
 LDAP_CFLAGS
 LDAP_LIBS
-BINDBUILD
-BINDBIND
+BINDLIBISCDIR
+BINDLIBISCCFGDIR
+BINDLIBDNSDIR
+BINDLIBIRSDIR
 BINDSRCDIR
 BINDDIR
+BINDSUBDIR
 BINDIOMUX
 ac_prefix_program
 DISTCHECK_ATF_CONFIGURE_FLAG
@@ -6906,11 +6909,14 @@ $as_echo "#define VLAN_TCI_PRESENT 1" >>confdefs.h
 fi
 
 
-# bind/Makefile.in is not from automake so we need 2 sets of variables
+# bind/Makefile.in is not from automake so we need 2 variables for bind dir
+BINDSUBDIR=
 BINDDIR=
 BINDSRCDIR=
-BINDBIND=
-BINDBUILD=
+BINDLIBIRSDIR=
+BINDLIBDNSDIR=
+BINDLIBISCCFGDIR=
+BINDLIBISCDIR=
 
 # Check whether --with-libbind was given.
 if test "${with_libbind+set}" = set; then :
@@ -6924,25 +6930,29 @@ yes)
        as_fn_error $? "PATH is required in --with-libbind=PATH" "$LINENO" 5
        ;;
 no)
-       BINDDIR="\${top_srcdir}/bind"
-       BINDSRCDIR="\${top_srcdir}/bind"
+       BINDSUBDIR="\${top_srcdir}/bind"
        my_abs_srcdir=`cd $srcdir && pwd`
-       BINDBIND="${my_abs_srcdir}/bind"
+       BINDDIR="${my_abs_srcdir}/bind"
        if test ! -d "$srcdir/bind"; then
                as_fn_error $? "Where to find or build bind includes and libraries must be specified" "$LINENO" 5
        fi
        if test -d "$srcdir/bind/bind9"; then
-               BINDBUILD="${my_abs_srcdir}/bind/bind9"
+               BINDSRCDIR="${my_abs_srcdir}/bind/bind9"
        else
                if test ! -f "$srcdir/bind/version.tmp"; then
                        as_fn_error $? "Cannot find $srcdir/bind/version.tmp" "$LINENO" 5
                fi
                . "$srcdir/bind/version.tmp"
                bindversion=${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}
-               BINDBUILD="${my_abs_srcdir}/bind/bind-$bindversion"
+               BINDSRCDIR="${my_abs_srcdir}/bind/bind-$bindversion"
        fi
        ac_config_files="$ac_config_files $srcdir/bind/Makefile"
 
+
+       BINDLIBIRSDIR="$BINDSRCDIR/lib/export/irs"
+       BINDLIBDNSDIR="$BINDSRCDIR/lib/export/dns"
+       BINDLIBISCCFGDIR="$BINDSRCDIR/lib/export/isccfg"
+       BINDLIBISCDIR="$BINDSRCDIR/lib/export/isc"
        ;;
 *)
        if test ! -d "$use_libbind"; then
@@ -6955,6 +6965,10 @@ no)
                as_fn_error $? "Cannot find bind libraries at $use_libbind/lib" "$LINENO" 5
        fi
        BINDDIR="$use_libbind"
+       BINDLIBIRSDIR="$BINDDIR/lib"
+       BINDLIBDNSDIR="$BINDDIR/lib"
+       BINDLIBISCCFGDIR="$BINDDIR/lib"
+       BINDLIBISCDIR="$BINDDIR/lib"
        ;;
 esac
 
@@ -6962,6 +6976,9 @@ esac
 
 
 
+
+
+
 # OpenLDAP support.
 
 # Check whether --with-ldap was given.

diff --git a/configure.ac b/configure.ac
index f5345550b93af95d1253890b24c6c2a715d009a4..862108cade7c73d870f12a73fd2de629d40a24ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -731,11 +731,14 @@ AC_CHECK_MEMBER(struct tpacket_auxdata.tp_vlan_tci,
     [AC_DEFINE([VLAN_TCI_PRESENT], [1], [tpacket_auxdata.tp_vlan_tci present])]
     ,, [#include <linux/if_packet.h>])
 
-# bind/Makefile.in is not from automake so we need 2 sets of variables
+# bind/Makefile.in is not from automake so we need 2 variables for bind dir
+BINDSUBDIR=
 BINDDIR=
 BINDSRCDIR=
-BINDBIND=
-BINDBUILD=
+BINDLIBIRSDIR=
+BINDLIBDNSDIR=
+BINDLIBISCCFGDIR=
+BINDLIBISCDIR=
 AC_ARG_WITH(libbind,
        AS_HELP_STRING([--with-libbind=PATH],[bind includes and libraries are in PATH]),
        use_libbind="$withval", use_libbind="no")
@@ -744,24 +747,28 @@ yes)
        AC_MSG_ERROR([PATH is required in --with-libbind=PATH])
        ;;
 no)
-       BINDDIR="\${top_srcdir}/bind"
-       BINDSRCDIR="\${top_srcdir}/bind"
+       BINDSUBDIR="\${top_srcdir}/bind"
        my_abs_srcdir=`cd $srcdir && pwd`
-       BINDBIND="${my_abs_srcdir}/bind"
+       BINDDIR="${my_abs_srcdir}/bind"
        if test ! -d "$srcdir/bind"; then
                AC_MSG_ERROR([Where to find or build bind includes and libraries must be specified])
        fi
        if test -d "$srcdir/bind/bind9"; then
-               BINDBUILD="${my_abs_srcdir}/bind/bind9"
+               BINDSRCDIR="${my_abs_srcdir}/bind/bind9"
        else
                if test ! -f "$srcdir/bind/version.tmp"; then
                        AC_MSG_ERROR([Cannot find $srcdir/bind/version.tmp])
                fi
                . "$srcdir/bind/version.tmp"
                bindversion=${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}
-               BINDBUILD="${my_abs_srcdir}/bind/bind-$bindversion"
+               BINDSRCDIR="${my_abs_srcdir}/bind/bind-$bindversion"
        fi
        AC_CONFIG_FILES([$srcdir/bind/Makefile])
+
+       BINDLIBIRSDIR="$BINDSRCDIR/lib/export/irs"
+       BINDLIBDNSDIR="$BINDSRCDIR/lib/export/dns"
+       BINDLIBISCCFGDIR="$BINDSRCDIR/lib/export/isccfg"
+       BINDLIBISCDIR="$BINDSRCDIR/lib/export/isc"
        ;;
 *)
        if test ! -d "$use_libbind"; then
@@ -774,12 +781,19 @@ no)
                AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/lib])
        fi
        BINDDIR="$use_libbind"
+       BINDLIBIRSDIR="$BINDDIR/lib"
+       BINDLIBDNSDIR="$BINDDIR/lib"
+       BINDLIBISCCFGDIR="$BINDDIR/lib"
+       BINDLIBISCDIR="$BINDDIR/lib"    
        ;;
 esac
+AC_SUBST(BINDSUBDIR)
 AC_SUBST(BINDDIR)
 AC_SUBST(BINDSRCDIR)
-AC_SUBST(BINDBIND)
-AC_SUBST(BINDBUILD)
+AC_SUBST(BINDLIBIRSDIR)
+AC_SUBST(BINDLIBDNSDIR)
+AC_SUBST(BINDLIBISCCFGDIR)
+AC_SUBST(BINDLIBISCDIR)
 
 # OpenLDAP support.
 AC_ARG_WITH(ldap,

diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am
index ceb0de12ffa9c0f204746ccc9a2ddacbde91a0c1..398f1e9d8ca3131d626238a626c90269c3da09d9 100644 (file)
--- a/dhcpctl/Makefile.am
+++ b/dhcpctl/Makefile.am
@@ -1,5 +1,3 @@
-BINDLIBDIR = @BINDDIR@/lib
-
 bin_PROGRAMS = omshell
 lib_LIBRARIES = libdhcpctl.a
 noinst_PROGRAMS = cltest
@@ -8,12 +6,16 @@ EXTRA_DIST = $(man_MANS)
 
 omshell_SOURCES = omshell.c
 omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
-               $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
-               $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
+               @BINDLIBIRSDIR@/libirs.a \
+               @BINDLIBDNSDIR@/libdns.a \
+               @BINDLIBISCCFGDIR@/libisccfg.a \
+               @BINDLIBISCDIR@/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 \
-              $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
-               $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
+              @BINDLIBIRSDIR@/libirs.a \
+              @BINDLIBDNSDIR@/libdns.a \
+              @BINDLIBISCCFGDIR@/libisccfg.a \
+              @BINDLIBISCDIR@/libisc.a

diff --git a/dhcpctl/Makefile.in b/dhcpctl/Makefile.in
index 47ccd2c589b8e7d372bcc88acd19975054bf55a0..1d8b04b616b4b4774e5fd848dae532be1f792164 100644 (file)
--- a/dhcpctl/Makefile.in
+++ b/dhcpctl/Makefile.in
@@ -145,15 +145,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 $(BINDLIBDIR)/libirs.a \
-       $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \
-       $(BINDLIBDIR)/libisc.a
+       ../omapip/libomapi.a @BINDLIBIRSDIR@/libirs.a \
+       @BINDLIBDNSDIR@/libdns.a @BINDLIBISCCFGDIR@/libisccfg.a \
+       @BINDLIBISCDIR@/libisc.a
 am_omshell_OBJECTS = omshell.$(OBJEXT)
 omshell_OBJECTS = $(am_omshell_OBJECTS)
 omshell_DEPENDENCIES = libdhcpctl.a ../common/libdhcp.a \
-       ../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
-       $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \
-       $(BINDLIBDIR)/libisc.a
+       ../omapip/libomapi.a @BINDLIBIRSDIR@/libirs.a \
+       @BINDLIBDNSDIR@/libdns.a @BINDLIBISCCFGDIR@/libisccfg.a \
+       @BINDLIBISCDIR@/libisc.a
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -228,7 +228,13 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BINDCONFIG = @BINDCONFIG@
 BINDDIR = @BINDDIR@
+BINDIOMUX = @BINDIOMUX@
+BINDLIBDNSDIR = @BINDLIBDNSDIR@
+BINDLIBIRSDIR = @BINDLIBIRSDIR@
+BINDLIBISCCFGDIR = @BINDLIBISCCFGDIR@
+BINDLIBISCDIR = @BINDLIBISCDIR@
 BINDSRCDIR = @BINDSRCDIR@
+BINDSUBDIR = @BINDSUBDIR@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -325,20 +331,23 @@ 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 \
-               $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
-               $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
+               @BINDLIBIRSDIR@/libirs.a \
+               @BINDLIBDNSDIR@/libdns.a \
+               @BINDLIBISCCFGDIR@/libisccfg.a \
+               @BINDLIBISCDIR@/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 \
-              $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
-               $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
+              @BINDLIBIRSDIR@/libirs.a \
+              @BINDLIBDNSDIR@/libdns.a \
+              @BINDLIBISCCFGDIR@/libisccfg.a \
+              @BINDLIBISCDIR@/libisc.a
 
 all: all-am
 

diff --git a/includes/Makefile.in b/includes/Makefile.in
index 0d1f9f4f201851618698972099a953848bc597b7..0050031b7b9e85ce87a62cfcd431431d12c7cce3 100644 (file)
--- a/includes/Makefile.in
+++ b/includes/Makefile.in
@@ -182,7 +182,13 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BINDCONFIG = @BINDCONFIG@
 BINDDIR = @BINDDIR@
+BINDIOMUX = @BINDIOMUX@
+BINDLIBDNSDIR = @BINDLIBDNSDIR@
+BINDLIBIRSDIR = @BINDLIBIRSDIR@
+BINDLIBISCCFGDIR = @BINDLIBISCCFGDIR@
+BINDLIBISCDIR = @BINDLIBISCDIR@
 BINDSRCDIR = @BINDSRCDIR@
+BINDSUBDIR = @BINDSUBDIR@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/omapip/Makefile.am b/omapip/Makefile.am
index 446a594162fbbb741b2f49f1d841414af04a29cb..e5fd4479d3bdfe16ca62549e859fc0c55f72ddb5 100644 (file)
--- a/omapip/Makefile.am
+++ b/omapip/Makefile.am
@@ -1,5 +1,3 @@
-BINDLIBDIR = @BINDDIR@/lib
-
 lib_LIBRARIES = libomapi.a
 noinst_PROGRAMS = svtest
 
@@ -12,6 +10,8 @@ man_MANS = omapi.3
 EXTRA_DIST = $(man_MANS)
 
 svtest_SOURCES = test.c
-svtest_LDADD = libomapi.a $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
-               $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
-
+svtest_LDADD = libomapi.a \
+              @BINDLIBIRSDIR@/libirs.a \
+              @BINDLIBDNSDIR@/libdns.a \
+              @BINDLIBISCCFGDIR@/libisccfg.a \
+              @BINDLIBISCDIR@/libisc.a

diff --git a/omapip/Makefile.in b/omapip/Makefile.in
index 0bb975d7bc59e8c6d62e06565e44fa00aa0d2e99..41bcf5b233364f1a97e8f0e2d4158271a773eb7f 100644 (file)
--- a/omapip/Makefile.in
+++ b/omapip/Makefile.in
@@ -148,9 +148,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 $(BINDLIBDIR)/libirs.a \
-       $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \
-       $(BINDLIBDIR)/libisc.a
+svtest_DEPENDENCIES = libomapi.a @BINDLIBIRSDIR@/libirs.a \
+       @BINDLIBDNSDIR@/libdns.a @BINDLIBISCCFGDIR@/libisccfg.a \
+       @BINDLIBISCDIR@/libisc.a
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -223,7 +223,13 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BINDCONFIG = @BINDCONFIG@
 BINDDIR = @BINDDIR@
+BINDIOMUX = @BINDIOMUX@
+BINDLIBDNSDIR = @BINDLIBDNSDIR@
+BINDLIBIRSDIR = @BINDLIBIRSDIR@
+BINDLIBISCCFGDIR = @BINDLIBISCCFGDIR@
+BINDLIBISCDIR = @BINDLIBISCDIR@
 BINDSRCDIR = @BINDSRCDIR@
+BINDSUBDIR = @BINDSUBDIR@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -320,7 +326,6 @@ 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 \
@@ -330,8 +335,11 @@ 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 $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
-               $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
+svtest_LDADD = libomapi.a \
+              @BINDLIBIRSDIR@/libirs.a \
+              @BINDLIBDNSDIR@/libdns.a \
+              @BINDLIBISCCFGDIR@/libisccfg.a \
+              @BINDLIBISCDIR@/libisc.a
 
 all: all-am
 

diff --git a/relay/Makefile.am b/relay/Makefile.am
index 3060eca4b172323ecffaf1f4fcd9936a8554bd54..0403426e32dbaaa17897677f889510530cf14d54 100644 (file)
--- a/relay/Makefile.am
+++ b/relay/Makefile.am
@@ -1,12 +1,12 @@
-BINDLIBDIR = @BINDDIR@/lib
-
 AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
 
 sbin_PROGRAMS = dhcrelay
 dhcrelay_SOURCES = dhcrelay.c
 dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
-                $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
-                $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
+                @BINDLIBIRSDIR@/libirs.a \
+                @BINDLIBDNSDIR@/libdns.a \
+                @BINDLIBISCCFGDIR@/libisccfg.a \
+                @BINDLIBISCDIR@/libisc.a
 man_MANS = dhcrelay.8
 EXTRA_DIST = $(man_MANS)
 

diff --git a/relay/Makefile.in b/relay/Makefile.in
index bfacfc05acfa3bbdc7ca52ebe6d675babf33fc2a..d46b27d88272447c7d916a55a483f88ad0017451 100644 (file)
--- a/relay/Makefile.in
+++ b/relay/Makefile.in
@@ -104,8 +104,8 @@ PROGRAMS = $(sbin_PROGRAMS)
 am_dhcrelay_OBJECTS = dhcrelay.$(OBJEXT)
 dhcrelay_OBJECTS = $(am_dhcrelay_OBJECTS)
 dhcrelay_DEPENDENCIES = ../common/libdhcp.a ../omapip/libomapi.a \
-       $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
-       $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
+       @BINDLIBIRSDIR@/libirs.a @BINDLIBDNSDIR@/libdns.a \
+       @BINDLIBISCCFGDIR@/libisccfg.a @BINDLIBISCDIR@/libisc.a
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -205,7 +205,13 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BINDCONFIG = @BINDCONFIG@
 BINDDIR = @BINDDIR@
+BINDIOMUX = @BINDIOMUX@
+BINDLIBDNSDIR = @BINDLIBDNSDIR@
+BINDLIBIRSDIR = @BINDLIBIRSDIR@
+BINDLIBISCCFGDIR = @BINDLIBISCCFGDIR@
+BINDLIBISCDIR = @BINDLIBISCDIR@
 BINDSRCDIR = @BINDSRCDIR@
+BINDSUBDIR = @BINDSUBDIR@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -302,12 +308,13 @@ 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 \
-                $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
-                $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
+                @BINDLIBIRSDIR@/libirs.a \
+                @BINDLIBDNSDIR@/libdns.a \
+                @BINDLIBISCCFGDIR@/libisccfg.a \
+                @BINDLIBISCDIR@/libisc.a
 
 man_MANS = dhcrelay.8
 EXTRA_DIST = $(man_MANS)

diff --git a/server/Makefile.in b/server/Makefile.in
index 9b7552320164c561481d18f22b05235938aa53a8..022512b3ebb8d0bcd150821ab4695ee2df33d81c 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -269,7 +269,13 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BINDCONFIG = @BINDCONFIG@
 BINDDIR = @BINDDIR@
+BINDIOMUX = @BINDIOMUX@
+BINDLIBDNSDIR = @BINDLIBDNSDIR@
+BINDLIBIRSDIR = @BINDLIBIRSDIR@
+BINDLIBISCCFGDIR = @BINDLIBISCCFGDIR@
+BINDLIBISCDIR = @BINDLIBISCDIR@
 BINDSRCDIR = @BINDSRCDIR@
+BINDSUBDIR = @BINDSUBDIR@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/server/tests/Makefile.in b/server/tests/Makefile.in
index b86a952d9c1d7d265b5cba98ef60eb3c3fa9d791..92a2a49ee47cd3b685cf8192a104ba4db3984dc7 100644 (file)
--- a/server/tests/Makefile.in
+++ b/server/tests/Makefile.in
@@ -285,7 +285,13 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BINDCONFIG = @BINDCONFIG@
 BINDDIR = @BINDDIR@
+BINDIOMUX = @BINDIOMUX@
+BINDLIBDNSDIR = @BINDLIBDNSDIR@
+BINDLIBIRSDIR = @BINDLIBIRSDIR@
+BINDLIBISCCFGDIR = @BINDLIBISCCFGDIR@
+BINDLIBISCDIR = @BINDLIBISCDIR@
 BINDSRCDIR = @BINDSRCDIR@
+BINDSUBDIR = @BINDSUBDIR@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/tests/Makefile.in b/tests/Makefile.in
index fccf568f01afebc2f0add36e8227777c29de9313..c8af0e523f5f1e6a8995f9589d9081b74360ec3e 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -176,7 +176,13 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BINDCONFIG = @BINDCONFIG@
 BINDDIR = @BINDDIR@
+BINDIOMUX = @BINDIOMUX@
+BINDLIBDNSDIR = @BINDLIBDNSDIR@
+BINDLIBIRSDIR = @BINDLIBIRSDIR@
+BINDLIBISCCFGDIR = @BINDLIBISCCFGDIR@
+BINDLIBISCDIR = @BINDLIBISCDIR@
 BINDSRCDIR = @BINDSRCDIR@
+BINDSUBDIR = @BINDSUBDIR@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/util/Makefile.bind.in b/util/Makefile.bind.in
index 95880347ae5472a9a21e6a30d7fdd8b34d6cb31f..7e127e18423a5fe43eb1c750c376e99d35547ba0 100644 (file)
--- a/util/Makefile.bind.in
+++ b/util/Makefile.bind.in
@@ -15,8 +15,8 @@
 
 # Configure and build the bind libraries for use by DHCP
 
-binddir=@BINDBIND@
-bindsrcdir=@BINDBUILD@
+binddir=@BINDDIR@
+bindsrcdir=@BINDSRCDIR@
 
 bindconfig = --without-openssl --without-libxml2 \
        --without-gssapi --disable-threads \