Finished merge of rt39210 (--with-libbind fixes) (regen required)

diff --cc Makefile.in
Simple merge

diff --cc client/Makefile.in
Simple merge

diff --cc client/tests/Makefile.in
Simple merge

diff --cc common/Makefile.in
Simple merge

diff --cc common/tests/Makefile.in
Simple merge

diff --cc configure
index 3325472ba2f58a9b8d3edce9bb6c964842963cc2,0d74cd63fc0a93ef269f57c43825ebfbad65b496..661a3c7243e3a17fb31288a054cf936716ca2126
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -626,7 -626,7 +626,8 @@@ am__EXEEXT_TRU
  LTLIBOBJS
  LIBOBJS
  LDAP_CFLAGS
 +LDAP_LIBS
+ BINDDIR
  ac_prefix_program
  HAVE_ATF_FALSE
  HAVE_ATF_TRUE

diff --cc configure.ac
Simple merge

diff --cc dhcpctl/Makefile.in
Simple merge

diff --cc includes/Makefile.in
Simple merge

diff --cc omapip/Makefile.in
Simple merge

diff --cc relay/Makefile.in
Simple merge

diff --cc server/Makefile.am
index 2d7cba4349e1c54c4fa2066d7dfb84f4320de7c2,2fe560723cd794d0dffab1a1bcfb3f4365280b5b..54feedf76187285799631de211d25bc216f1fa97
--- 1/server/Makefile.am
--- 2/server/Makefile.am
+++ b/server/Makefile.am
@@@ -14,9 -16,9 +16,9 @@@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.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 \
-             $(LDAP_LIBS)              
+             ../dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \
+             $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \
 -            $(BINDLIBDIR)/libisc.a
++            $(BINDLIBDIR)/libisc.a $(LDAP_LIBS)
  
  man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
  EXTRA_DIST = $(man_MANS)

diff --cc server/Makefile.in
index 246c0de8cc4b2cf5deefae340f750b7305f96f8d,d15d78fc4fa0ed6b7683b0856f17c9f51cd241aa..9778464f2b30f6bc9d07d3b08848037ea24cbeca
--- 1/server/Makefile.in
--- 2/server/Makefile.in
+++ b/server/Makefile.in
@@@ -112,14 -112,12 +112,14 @@@ am_dhcpd_OBJECTS = dhcpd-dhcpd.$(OBJEXT
        dhcpd-salloc.$(OBJEXT) dhcpd-ddns.$(OBJEXT) \
        dhcpd-dhcpleasequery.$(OBJEXT) dhcpd-dhcpv6.$(OBJEXT) \
        dhcpd-mdb6.$(OBJEXT) dhcpd-ldap.$(OBJEXT) \
 -      dhcpd-ldap_casa.$(OBJEXT)
 +      dhcpd-ldap_casa.$(OBJEXT) dhcpd-leasechain.$(OBJEXT) \
 +      dhcpd-ldap_krb_helper.$(OBJEXT)
  dhcpd_OBJECTS = $(am_dhcpd_OBJECTS)
 +am__DEPENDENCIES_1 =
  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 $(am__DEPENDENCIES_1)
+       ../dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \
+       $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \
 -      $(BINDLIBDIR)/libisc.a
++      $(BINDLIBDIR)/libisc.a $(am__DEPENDENCIES_1)
  dhcpd_LINK = $(CCLD) $(dhcpd_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
  AM_V_P = $(am__v_P_@AM_V@)
@@@ -375,9 -374,9 +377,9 @@@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.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 \
-             $(LDAP_LIBS)              
+             ../dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \
+             $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \
 -            $(BINDLIBDIR)/libisc.a
++            $(BINDLIBDIR)/libisc.a $(LDAP_LIBS)
  
  man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
  EXTRA_DIST = $(man_MANS)

diff --cc server/tests/Makefile.am
index 84ae202bd2af7bff03f34f03dedb1af3cb7c5116,0353c64758a18cdea2bd117a2d9f834721471ca8..2c644bfacf565f0c195543392b5e6302618bee12
--- 1/server/tests/Makefile.am
--- 2/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@@ -15,12 -17,12 +17,12 @@@ info
  DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c      \
            ../failover.c ../omapi.c ../mdb.c ../stables.c ../salloc.c \
            ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c        \
 -          ../ldap.c ../ldap_casa.c ../dhcpd.c
 +          ../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.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 =
  if HAVE_ATF

diff --cc server/tests/Makefile.in
index 1c794f98b62cff17a1881d83cc2d63859d18ef47,8e1887299fd66769d7a50de200d7508aae93cd6c..a4fa2adbde491b80942126bc35abbd72942d5dc5
--- 1/server/tests/Makefile.in
--- 2/server/tests/Makefile.in
+++ b/server/tests/Makefile.in
@@@ -385,12 -372,12 +386,12 @@@ EXTRA_DIST = Atffil
  DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c      \
            ../failover.c ../omapi.c ../mdb.c ../stables.c ../salloc.c \
            ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c        \
 -          ../ldap.c ../ldap_casa.c ../dhcpd.c
 +          ../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.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 --cc tests/Makefile.in
Simple merge