|
 |
7406750 |
diff -up dhcp-4.3.3b1/client/Makefile.am.remove-bind dhcp-4.3.3b1/client/Makefile.am
|
|
|
7406750 |
--- dhcp-4.3.3b1/client/Makefile.am.remove-bind 2015-07-30 15:17:16.000000000 +0200
|
|
|
7406750 |
+++ dhcp-4.3.3b1/client/Makefile.am 2015-08-10 10:20:26.373965596 +0200
|
|
|
7b69e54 |
@@ -10,8 +10,8 @@ dhclient_SOURCES = clparse.c dhclient.c
|
|
|
e83fb19 |
scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
|
|
|
e83fb19 |
scripts/netbsd scripts/nextstep scripts/openbsd \
|
|
|
e83fb19 |
scripts/solaris scripts/openwrt
|
|
|
e83fb19 |
-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../bind/lib/libirs.a \
|
|
|
e83fb19 |
- ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a
|
|
|
e83fb19 |
+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
|
 |
cccec22 |
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
e83fb19 |
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
|
|
|
e83fb19 |
EXTRA_DIST = $(man_MANS)
|
|
|
e83fb19 |
|
|
|
7406750 |
diff -up dhcp-4.3.3b1/common/tests/Makefile.am.remove-bind dhcp-4.3.3b1/common/tests/Makefile.am
|
|
|
7406750 |
--- dhcp-4.3.3b1/common/tests/Makefile.am.remove-bind 2015-07-30 15:17:16.000000000 +0200
|
|
|
7406750 |
+++ dhcp-4.3.3b1/common/tests/Makefile.am 2015-08-10 10:20:26.373965596 +0200
|
|
|
9568cf3 |
@@ -13,14 +13,14 @@ ATF_TESTS += alloc_unittest dns_unittest
|
|
|
e83fb19 |
alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
|
|
|
e83fb19 |
alloc_unittest_LDADD = $(ATF_LDFLAGS)
|
|
|
e83fb19 |
alloc_unittest_LDADD += ../libdhcp.a \
|
|
|
e83fb19 |
- ../../omapip/libomapi.a ../../bind/lib/libirs.a \
|
|
|
e83fb19 |
- ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a ../../bind/lib/libisc.a
|
|
|
e83fb19 |
+ ../../omapip/libomapi.a \
|
|
|
cccec22 |
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
e83fb19 |
|
|
|
e83fb19 |
dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
|
|
|
e83fb19 |
dns_unittest_LDADD = $(ATF_LDFLAGS)
|
|
|
e83fb19 |
dns_unittest_LDADD += ../libdhcp.a \
|
|
|
e83fb19 |
- ../../omapip/libomapi.a ../../bind/lib/libirs.a \
|
|
|
e83fb19 |
- ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a ../../bind/lib/libisc.a
|
|
|
7b69e54 |
+ ../../omapip/libomapi.a \
|
|
|
cccec22 |
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
7b69e54 |
|
|
|
7b69e54 |
misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
|
|
|
7b69e54 |
misc_unittest_LDADD = $(ATF_LDFLAGS)
|
|
|
5ca2db2 |
@@ -31,8 +31,8 @@ misc_unittest_LDADD += ../libdhcp.a \
|
|
|
9568cf3 |
ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c
|
|
|
9568cf3 |
ns_name_unittest_LDADD = $(ATF_LDFLAGS)
|
|
|
9568cf3 |
ns_name_unittest_LDADD += ../libdhcp.a \
|
|
|
7b69e54 |
- ../../omapip/libomapi.a ../../bind/lib/libirs.a \
|
|
|
7b69e54 |
- ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a ../../bind/lib/libisc.a
|
|
|
e83fb19 |
+ ../../omapip/libomapi.a \
|
|
|
cccec22 |
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
e83fb19 |
|
|
|
5ca2db2 |
check: $(ATF_TESTS)
|
|
|
5ca2db2 |
sh ${top_srcdir}/tests/unittest.sh
|
|
|
7406750 |
diff -up dhcp-4.3.3b1/configure.ac.remove-bind dhcp-4.3.3b1/configure.ac
|
|
|
7406750 |
--- dhcp-4.3.3b1/configure.ac.remove-bind 2015-07-30 21:02:23.000000000 +0200
|
|
|
7406750 |
+++ dhcp-4.3.3b1/configure.ac 2015-08-10 10:31:02.761852511 +0200
|
|
|
7406750 |
@@ -606,23 +606,40 @@ AC_CHECK_MEMBER(struct tpacket_auxdata.t
|
|
|
e83fb19 |
|
|
|
e83fb19 |
libbind=
|
|
|
e83fb19 |
AC_ARG_WITH(libbind,
|
|
|
e83fb19 |
- AS_HELP_STRING([--with-libbind=PATH],[bind includes and libraries are in PATH
|
|
|
e83fb19 |
- (default is ./bind)]),
|
|
|
e83fb19 |
+ AS_HELP_STRING([--with-libbind=PATH],[bind includes are in PATH
|
|
|
e83fb19 |
+ (default is ./bind/includes)]),
|
|
|
e83fb19 |
use_libbind="$withval", use_libbind="no")
|
|
|
e83fb19 |
case "$use_libbind" in
|
|
|
e83fb19 |
+yes|no)
|
|
|
e83fb19 |
+ libbind="\${top_srcdir}/bind/include"
|
|
|
e83fb19 |
+ ;;
|
|
|
e83fb19 |
+*)
|
|
|
e83fb19 |
+ libbind="$use_libbind"
|
|
|
e83fb19 |
+ ;;
|
|
|
e83fb19 |
+esac
|
|
|
e83fb19 |
+
|
|
|
e83fb19 |
+BIND9_LIBDIR='-L$(top_builddir)/bind/lib'
|
|
|
e83fb19 |
+AC_ARG_WITH(libbind-libs,
|
|
|
e83fb19 |
+ AC_HELP_STRING([--with-libbind-libs=PATH],
|
|
|
e83fb19 |
+ [bind9 export libraries are in PATH]),
|
|
|
e83fb19 |
+ [libbind_libs="$withval"], [libbind_libs='no'])
|
|
|
e83fb19 |
+case "$libbind_libs" in
|
|
|
e83fb19 |
yes)
|
|
|
e83fb19 |
- libbind="\${top_srcdir}/bind"
|
|
|
e83fb19 |
+ AC_MSG_ERROR([Specify path to bind9 libraries])
|
|
|
e83fb19 |
;;
|
|
|
e83fb19 |
no)
|
|
|
e83fb19 |
- libbind="\${top_srcdir}/bind"
|
|
|
e83fb19 |
+ BUNDLED_BIND=yes
|
|
|
e83fb19 |
;;
|
|
|
e83fb19 |
*)
|
|
|
e83fb19 |
- libbind="$use_libbind"
|
|
|
e83fb19 |
+ BIND9_LIBDIR="-L$libbind_libs"
|
|
|
e83fb19 |
+ BUNDLED_BIND=no
|
|
|
7406750 |
if test ! -d "bind"; then
|
|
|
7406750 |
AC_MSG_WARN(empty bind directory)
|
|
|
7406750 |
fi
|
|
|
e83fb19 |
;;
|
|
|
e83fb19 |
esac
|
|
|
e83fb19 |
+AM_CONDITIONAL([BUNDLED_BIND], [test "$BUNDLED_BIND" = yes])
|
|
|
e83fb19 |
+AC_SUBST([BIND9_LIBDIR])
|
|
|
e83fb19 |
|
|
|
e83fb19 |
# OpenLDAP support.
|
|
|
e83fb19 |
AC_ARG_WITH(ldap,
|
|
|
7406750 |
@@ -700,7 +717,7 @@ fi
|
|
|
e83fb19 |
CFLAGS="$CFLAGS $STD_CWARNINGS"
|
|
|
e83fb19 |
|
|
|
e83fb19 |
# Try to add the bind include directory
|
|
|
e83fb19 |
-CFLAGS="$CFLAGS -I$libbind/include"
|
|
|
e83fb19 |
+CFLAGS="$CFLAGS -I$libbind"
|
|
|
e83fb19 |
|
|
|
e83fb19 |
case "$host" in
|
|
|
e83fb19 |
*-darwin*)
|
|
|
7406750 |
diff -up dhcp-4.3.3b1/dhcpctl/Makefile.am.remove-bind dhcp-4.3.3b1/dhcpctl/Makefile.am
|
|
|
7406750 |
--- dhcp-4.3.3b1/dhcpctl/Makefile.am.remove-bind 2015-07-30 15:17:16.000000000 +0200
|
|
|
7406750 |
+++ dhcp-4.3.3b1/dhcpctl/Makefile.am 2015-08-10 10:20:26.374965593 +0200
|
|
|
e83fb19 |
@@ -6,12 +6,9 @@ EXTRA_DIST = $(man_MANS)
|
|
|
e83fb19 |
|
|
|
e83fb19 |
omshell_SOURCES = omshell.c
|
|
|
e83fb19 |
omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
|
|
|
e83fb19 |
- ../bind/lib/libirs.a ../bind/lib/libdns.a \
|
|
|
e83fb19 |
- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
|
|
|
e83fb19 |
-
|
|
|
cccec22 |
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
e83fb19 |
libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
|
|
|
e83fb19 |
|
|
|
e83fb19 |
cltest_SOURCES = cltest.c
|
|
|
e83fb19 |
cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
|
|
|
e83fb19 |
- ../bind/lib/libirs.a ../bind/lib/libdns.a \
|
|
|
e83fb19 |
- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
|
|
|
cccec22 |
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
7406750 |
diff -up dhcp-4.3.3b1/Makefile.am.remove-bind dhcp-4.3.3b1/Makefile.am
|
|
|
7406750 |
--- dhcp-4.3.3b1/Makefile.am.remove-bind 2015-08-10 10:20:26.374965593 +0200
|
|
|
7406750 |
+++ dhcp-4.3.3b1/Makefile.am 2015-08-10 10:32:20.540597417 +0200
|
|
|
7b69e54 |
@@ -25,7 +25,13 @@ EXTRA_DIST = RELNOTES LICENSE \
|
|
|
7406750 |
bind/Makefile.in bind/bind.tar.gz bind/version.tmp \
|
|
|
7b69e54 |
common/tests/Atffile server/tests/Atffile
|
|
|
7b69e54 |
|
|
|
7406750 |
-SUBDIRS = bind includes tests common omapip client dhcpctl relay server
|
|
|
7b69e54 |
+if BUNDLED_BIND
|
|
|
7b69e54 |
+SUBDIRS = bind
|
|
|
7b69e54 |
+else
|
|
|
7b69e54 |
+SUBDIRS =
|
|
|
7b69e54 |
+endif
|
|
|
7b69e54 |
+
|
|
|
7406750 |
+SUBDIRS += includes tests common omapip client dhcpctl relay server
|
|
|
7b69e54 |
|
|
|
7b69e54 |
nobase_include_HEADERS = dhcpctl/dhcpctl.h
|
|
|
7b69e54 |
|
|
|
7406750 |
diff -up dhcp-4.3.3b1/omapip/Makefile.am.remove-bind dhcp-4.3.3b1/omapip/Makefile.am
|
|
|
7406750 |
--- dhcp-4.3.3b1/omapip/Makefile.am.remove-bind 2015-07-30 15:17:16.000000000 +0200
|
|
|
7406750 |
+++ dhcp-4.3.3b1/omapip/Makefile.am 2015-08-10 10:20:26.375965590 +0200
|
|
|
e83fb19 |
@@ -10,6 +10,5 @@ man_MANS = omapi.3
|
|
|
e83fb19 |
EXTRA_DIST = $(man_MANS)
|
|
|
e83fb19 |
|
|
|
e83fb19 |
svtest_SOURCES = test.c
|
|
|
e83fb19 |
-svtest_LDADD = libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \
|
|
|
e83fb19 |
- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
|
|
|
e83fb19 |
-
|
|
|
e83fb19 |
+svtest_LDADD = libomapi.a \
|
|
|
cccec22 |
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
7406750 |
diff -up dhcp-4.3.3b1/relay/Makefile.am.remove-bind dhcp-4.3.3b1/relay/Makefile.am
|
|
|
7406750 |
--- dhcp-4.3.3b1/relay/Makefile.am.remove-bind 2015-07-30 15:17:16.000000000 +0200
|
|
|
7406750 |
+++ dhcp-4.3.3b1/relay/Makefile.am 2015-08-10 10:20:26.375965590 +0200
|
|
|
e83fb19 |
@@ -3,8 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
|
|
|
e83fb19 |
sbin_PROGRAMS = dhcrelay
|
|
|
e83fb19 |
dhcrelay_SOURCES = dhcrelay.c
|
|
|
e83fb19 |
dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
|
|
e83fb19 |
- ../bind/lib/libirs.a ../bind/lib/libdns.a \
|
|
|
e83fb19 |
- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
|
|
|
cccec22 |
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
e83fb19 |
man_MANS = dhcrelay.8
|
|
|
e83fb19 |
EXTRA_DIST = $(man_MANS)
|
|
|
e83fb19 |
|
|
|
7406750 |
diff -up dhcp-4.3.3b1/server/Makefile.am.remove-bind dhcp-4.3.3b1/server/Makefile.am
|
|
|
7406750 |
--- dhcp-4.3.3b1/server/Makefile.am.remove-bind 2015-08-10 10:20:26.375965590 +0200
|
|
|
7406750 |
+++ dhcp-4.3.3b1/server/Makefile.am 2015-08-10 10:34:07.597246299 +0200
|
|
|
7406750 |
@@ -13,10 +13,9 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
|
|
|
7406750 |
dhcpv6.c mdb6.c ldap.c ldap_casa.c leasechain.c ldap_krb_helper.c
|
|
|
e83fb19 |
|
|
|
e83fb19 |
dhcpd_CFLAGS = $(LDAP_CFLAGS)
|
|
|
e83fb19 |
-dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
|
|
e83fb19 |
- ../dhcpctl/libdhcpctl.a ../bind/lib/libirs.a \
|
|
|
7406750 |
- ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a \
|
|
|
7406750 |
- $(LDAP_LIBS)
|
|
|
e83fb19 |
+dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dhcpctl/libdhcpctl.a \
|
|
|
7406750 |
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export \
|
|
|
7406750 |
+ $(LDAP_LIBS)
|
|
|
7406750 |
|
|
|
e83fb19 |
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
|
|
|
e83fb19 |
EXTRA_DIST = $(man_MANS)
|
|
|
7406750 |
diff -up dhcp-4.3.3b1/server/tests/Makefile.am.remove-bind dhcp-4.3.3b1/server/tests/Makefile.am
|
|
|
7406750 |
--- dhcp-4.3.3b1/server/tests/Makefile.am.remove-bind 2015-08-10 10:20:26.375965590 +0200
|
|
|
7406750 |
+++ dhcp-4.3.3b1/server/tests/Makefile.am 2015-08-10 10:35:34.931959866 +0200
|
|
|
e83fb19 |
@@ -18,9 +18,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
|
|
|
7406750 |
../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c
|
|
|
e83fb19 |
|
|
|
e83fb19 |
DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \
|
|
|
e83fb19 |
- $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/bind/lib/libirs.a \
|
|
|
e83fb19 |
- $(top_builddir)/bind/lib/libdns.a $(top_builddir)/bind/lib/libisccfg.a \
|
|
|
e83fb19 |
- $(top_builddir)/bind/lib/libisc.a
|
|
|
5ca2db2 |
+ $(top_builddir)/dhcpctl/libdhcpctl.a \
|
|
|
cccec22 |
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
e83fb19 |
|
|
|
e83fb19 |
ATF_TESTS =
|
|
|
5ca2db2 |
if HAVE_ATF
|