From: Francis Dupont <fdupont@isc.org>
Date: Tue, 17 Nov 2015 13:55:09 +0000 (+0100)
Subject: Finished merge of rt39210 (--with-libbind fixes) (regen required)
X-Git-Tag: v4_3_4~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a555d1ab9ff099e4bf278ba416188b7491f51f7f;p=thirdparty%2Fdhcp.git

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

a555d1ab9ff099e4bf278ba416188b7491f51f7f
diff --cc configure
index 3325472ba,0d74cd63f..661a3c724
--- a/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 server/Makefile.am
index 2d7cba434,2fe560723..54feedf76
--- a/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 246c0de8c,d15d78fc4..9778464f2
--- a/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 84ae202bd,0353c6475..2c644bfac
--- a/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 1c794f98b,8e1887299..a4fa2adbd
--- a/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