|
 |
8173a68 |
diff -up dhcp-4.3.4/client/Makefile.am.remove-bind dhcp-4.3.4/client/Makefile.am
|
|
|
8173a68 |
--- dhcp-4.3.4/client/Makefile.am.remove-bind 2016-03-22 14:16:51.000000000 +0100
|
|
|
8173a68 |
+++ dhcp-4.3.4/client/Makefile.am 2016-04-29 14:13:50.335204352 +0200
|
|
|
8173a68 |
@@ -4,8 +4,6 @@
|
|
|
8173a68 |
# production code. Sadly, we are not there yet.
|
|
|
8173a68 |
SUBDIRS = . tests
|
|
|
8173a68 |
|
|
|
8173a68 |
-BINDLIBDIR = @BINDDIR@/lib
|
|
|
8173a68 |
-
|
|
|
8173a68 |
AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
|
|
|
8173a68 |
-DLOCALSTATEDIR='"$(localstatedir)"'
|
|
|
8173a68 |
|
|
|
8173a68 |
@@ -15,7 +13,7 @@ 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
|
|
|
8173a68 |
-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
|
|
|
8173a68 |
- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/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)
|
|
|
8173a68 |
diff -up dhcp-4.3.4/common/tests/Makefile.am.remove-bind dhcp-4.3.4/common/tests/Makefile.am
|
|
|
8173a68 |
--- dhcp-4.3.4/common/tests/Makefile.am.remove-bind 2016-03-22 14:16:51.000000000 +0100
|
|
|
8173a68 |
+++ dhcp-4.3.4/common/tests/Makefile.am 2016-04-29 14:13:50.335204352 +0200
|
|
|
8173a68 |
@@ -1,7 +1,5 @@
|
|
|
8173a68 |
SUBDIRS = .
|
|
|
e83fb19 |
|
|
|
8173a68 |
-BINDLIBDIR = @BINDDIR@/lib
|
|
|
8173a68 |
-
|
|
|
8173a68 |
AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes
|
|
|
8173a68 |
|
|
|
8173a68 |
EXTRA_DIST = Atffile
|
|
|
8173a68 |
@@ -15,26 +13,26 @@ 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 \
|
|
|
8173a68 |
- ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
|
|
|
8173a68 |
- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/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 \
|
|
|
8173a68 |
- ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
|
|
|
8173a68 |
- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/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)
|
|
|
8173a68 |
misc_unittest_LDADD += ../libdhcp.a \
|
|
|
8173a68 |
- ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
|
|
|
8173a68 |
- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
|
|
|
8173a68 |
+ ../../omapip/libomapi.a \
|
|
|
8173a68 |
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
8173a68 |
|
|
|
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 \
|
|
|
8173a68 |
- ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
|
|
|
8173a68 |
- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
|
|
|
e83fb19 |
+ ../../omapip/libomapi.a \
|
|
|
cccec22 |
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
e83fb19 |
|
|
|
5ca2db2 |
check: $(ATF_TESTS)
|
|
|
8173a68 |
-cp -n $(top_srcdir)/common/tests/Atffile Atffile
|
|
|
8173a68 |
diff -up dhcp-4.3.4/configure.ac.remove-bind dhcp-4.3.4/configure.ac
|
|
|
8173a68 |
--- dhcp-4.3.4/configure.ac.remove-bind 2016-03-22 14:19:51.000000000 +0100
|
|
|
8173a68 |
+++ dhcp-4.3.4/configure.ac 2016-04-29 14:13:50.335204352 +0200
|
|
|
8173a68 |
@@ -682,20 +682,33 @@ AC_CHECK_MEMBER(struct tpacket_auxdata.t
|
|
|
8173a68 |
BINDDIR=
|
|
|
8173a68 |
BINDSRCDIR=
|
|
|
e83fb19 |
AC_ARG_WITH(libbind,
|
|
|
8173a68 |
- AS_HELP_STRING([--with-libbind=PATH],[bind includes and libraries are in PATH
|
|
|
e83fb19 |
- (default is ./bind)]),
|
|
|
8173a68 |
+ AS_HELP_STRING([--with-libbind=PATH],[bind includes are in PATH
|
|
|
e83fb19 |
+ (default is ./bind/includes)]),
|
|
|
e83fb19 |
use_libbind="$withval", use_libbind="no")
|
|
|
8173a68 |
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)
|
|
|
8173a68 |
- BINDDIR="\${top_srcdir}/bind"
|
|
|
8173a68 |
- BINDSRCDIR="\${top_srcdir}/bind"
|
|
|
e83fb19 |
+ AC_MSG_ERROR([Specify path to bind9 libraries])
|
|
|
e83fb19 |
;;
|
|
|
e83fb19 |
no)
|
|
|
8173a68 |
- BINDDIR="\${top_srcdir}/bind"
|
|
|
8173a68 |
- BINDSRCDIR="\${top_srcdir}/bind"
|
|
|
e83fb19 |
+ BUNDLED_BIND=yes
|
|
|
e83fb19 |
;;
|
|
|
e83fb19 |
*)
|
|
|
8173a68 |
- BINDDIR="$use_libbind"
|
|
|
e83fb19 |
+ BIND9_LIBDIR="-L$libbind_libs"
|
|
|
e83fb19 |
+ BUNDLED_BIND=no
|
|
|
8173a68 |
if test ! -d "$srcdir/bind"; then
|
|
|
8173a68 |
# no bind directory, create it with a fake Makefile.in
|
|
|
8173a68 |
# (AC_CONFIG_FILES and top Makefile refer to it so
|
|
|
8173a68 |
@@ -709,8 +722,8 @@ EOF
|
|
|
8173a68 |
fi
|
|
|
e83fb19 |
;;
|
|
|
e83fb19 |
esac
|
|
|
8173a68 |
-AC_SUBST(BINDDIR)
|
|
|
8173a68 |
-AC_SUBST(BINDSRCDIR)
|
|
|
e83fb19 |
+AM_CONDITIONAL([BUNDLED_BIND], [test "$BUNDLED_BIND" = yes])
|
|
|
e83fb19 |
+AC_SUBST([BIND9_LIBDIR])
|
|
|
e83fb19 |
|
|
|
e83fb19 |
# OpenLDAP support.
|
|
|
e83fb19 |
AC_ARG_WITH(ldap,
|
|
|
8173a68 |
@@ -788,7 +801,7 @@ fi
|
|
|
e83fb19 |
CFLAGS="$CFLAGS $STD_CWARNINGS"
|
|
|
e83fb19 |
|
|
|
8173a68 |
# Try to add the bind and dhcp include directories
|
|
|
8173a68 |
-CFLAGS="$CFLAGS -I\$(top_srcdir)/includes -I$BINDDIR/include"
|
|
|
e83fb19 |
+CFLAGS="$CFLAGS -I$libbind"
|
|
|
e83fb19 |
|
|
|
e83fb19 |
case "$host" in
|
|
|
e83fb19 |
*-darwin*)
|
|
|
8173a68 |
diff -up dhcp-4.3.4/dhcpctl/Makefile.am.remove-bind dhcp-4.3.4/dhcpctl/Makefile.am
|
|
|
8173a68 |
--- dhcp-4.3.4/dhcpctl/Makefile.am.remove-bind 2016-03-22 14:16:51.000000000 +0100
|
|
|
8173a68 |
+++ dhcp-4.3.4/dhcpctl/Makefile.am 2016-04-29 14:13:50.336204352 +0200
|
|
|
8173a68 |
@@ -1,5 +1,3 @@
|
|
|
8173a68 |
-BINDLIBDIR = @BINDDIR@/lib
|
|
|
8173a68 |
-
|
|
|
8173a68 |
bin_PROGRAMS = omshell
|
|
|
8173a68 |
lib_LIBRARIES = libdhcpctl.a
|
|
|
8173a68 |
noinst_PROGRAMS = cltest
|
|
|
8173a68 |
@@ -8,12 +6,10 @@ EXTRA_DIST = $(man_MANS)
|
|
|
e83fb19 |
|
|
|
e83fb19 |
omshell_SOURCES = omshell.c
|
|
|
e83fb19 |
omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
|
|
|
8173a68 |
- $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
|
|
|
8173a68 |
- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
|
|
|
cccec22 |
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
8173a68 |
|
|
|
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 \
|
|
|
8173a68 |
- $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
|
|
|
8173a68 |
- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
|
|
|
cccec22 |
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
8173a68 |
diff -up dhcp-4.3.4/Makefile.am.remove-bind dhcp-4.3.4/Makefile.am
|
|
|
8173a68 |
--- dhcp-4.3.4/Makefile.am.remove-bind 2016-03-22 14:16:51.000000000 +0100
|
|
|
8173a68 |
+++ dhcp-4.3.4/Makefile.am 2016-04-29 14:14:06.863193261 +0200
|
|
|
8173a68 |
@@ -26,7 +26,13 @@ EXTRA_DIST = RELNOTES LICENSE \
|
|
|
7406750 |
bind/Makefile.in bind/bind.tar.gz bind/version.tmp \
|
|
|
7b69e54 |
common/tests/Atffile server/tests/Atffile
|
|
|
7b69e54 |
|
|
|
8173a68 |
-SUBDIRS = @BINDSRCDIR@ 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 |
|
|
|
8173a68 |
diff -up dhcp-4.3.4/omapip/Makefile.am.remove-bind dhcp-4.3.4/omapip/Makefile.am
|
|
|
8173a68 |
--- dhcp-4.3.4/omapip/Makefile.am.remove-bind 2016-03-22 14:16:51.000000000 +0100
|
|
|
8173a68 |
+++ dhcp-4.3.4/omapip/Makefile.am 2016-04-29 14:13:50.336204352 +0200
|
|
|
8173a68 |
@@ -1,5 +1,3 @@
|
|
|
8173a68 |
-BINDLIBDIR = @BINDDIR@/lib
|
|
|
8173a68 |
-
|
|
|
8173a68 |
lib_LIBRARIES = libomapi.a
|
|
|
8173a68 |
noinst_PROGRAMS = svtest
|
|
|
8173a68 |
|
|
|
8173a68 |
@@ -12,6 +10,6 @@ man_MANS = omapi.3
|
|
|
e83fb19 |
EXTRA_DIST = $(man_MANS)
|
|
|
e83fb19 |
|
|
|
e83fb19 |
svtest_SOURCES = test.c
|
|
|
8173a68 |
-svtest_LDADD = libomapi.a $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
|
|
|
8173a68 |
- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
|
|
|
e83fb19 |
+svtest_LDADD = libomapi.a \
|
|
|
cccec22 |
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
8173a68 |
|
|
|
8173a68 |
diff -up dhcp-4.3.4/relay/Makefile.am.remove-bind dhcp-4.3.4/relay/Makefile.am
|
|
|
8173a68 |
--- dhcp-4.3.4/relay/Makefile.am.remove-bind 2016-03-22 14:16:51.000000000 +0100
|
|
|
8173a68 |
+++ dhcp-4.3.4/relay/Makefile.am 2016-04-29 14:13:50.336204352 +0200
|
|
|
8173a68 |
@@ -1,12 +1,9 @@
|
|
|
8173a68 |
-BINDLIBDIR = @BINDDIR@/lib
|
|
|
8173a68 |
-
|
|
|
8173a68 |
AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
|
|
|
8173a68 |
|
|
|
e83fb19 |
sbin_PROGRAMS = dhcrelay
|
|
|
e83fb19 |
dhcrelay_SOURCES = dhcrelay.c
|
|
|
e83fb19 |
dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
|
|
8173a68 |
- $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
|
|
|
8173a68 |
- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
|
|
|
cccec22 |
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
e83fb19 |
man_MANS = dhcrelay.8
|
|
|
e83fb19 |
EXTRA_DIST = $(man_MANS)
|
|
|
e83fb19 |
|
|
|
8173a68 |
diff -up dhcp-4.3.4/server/Makefile.am.remove-bind dhcp-4.3.4/server/Makefile.am
|
|
|
8173a68 |
--- dhcp-4.3.4/server/Makefile.am.remove-bind 2016-03-22 14:16:51.000000000 +0100
|
|
|
8173a68 |
+++ dhcp-4.3.4/server/Makefile.am 2016-04-29 14:13:50.336204352 +0200
|
|
|
8173a68 |
@@ -4,8 +4,6 @@
|
|
|
8173a68 |
# production code. Sadly, we are not there yet.
|
|
|
8173a68 |
SUBDIRS = . tests
|
|
|
8173a68 |
|
|
|
8173a68 |
-BINDLIBDIR = @BINDDIR@/lib
|
|
|
8173a68 |
-
|
|
|
8173a68 |
AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
|
|
|
8173a68 |
|
|
|
8173a68 |
dist_sysconf_DATA = dhcpd.conf.example
|
|
|
8173a68 |
@@ -15,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 \
|
|
|
8173a68 |
- ../dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \
|
|
|
8173a68 |
- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \
|
|
|
8173a68 |
- $(BINDLIBDIR)/libisc.a $(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)
|
|
|
8173a68 |
diff -up dhcp-4.3.4/server/tests/Makefile.am.remove-bind dhcp-4.3.4/server/tests/Makefile.am
|
|
|
8173a68 |
--- dhcp-4.3.4/server/tests/Makefile.am.remove-bind 2016-03-22 14:16:51.000000000 +0100
|
|
|
8173a68 |
+++ dhcp-4.3.4/server/tests/Makefile.am 2016-04-29 14:13:50.336204352 +0200
|
|
|
8173a68 |
@@ -1,9 +1,7 @@
|
|
|
8173a68 |
SUBDIRS = .
|
|
|
8173a68 |
|
|
|
8173a68 |
-BINDLIBDIR = @BINDDIR@/lib
|
|
|
8173a68 |
-
|
|
|
8173a68 |
AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
|
|
|
8173a68 |
-AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
|
|
|
8173a68 |
+AM_CPPFLAGS += -I$(top_srcdir)
|
|
|
8173a68 |
AM_CPPFLAGS += -DLOCALSTATEDIR='"."'
|
|
|
8173a68 |
|
|
|
8173a68 |
EXTRA_DIST = Atffile
|
|
|
8173a68 |
@@ -20,9 +18,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
|
|
|
7406750 |
../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c
|
|
|
e83fb19 |
|
|
|
8173a68 |
DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \
|
|
|
8173a68 |
- $(top_builddir)/dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \
|
|
|
8173a68 |
- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \
|
|
|
8173a68 |
- $(BINDLIBDIR)/libisc.a
|
|
|
8173a68 |
+ $(top_builddir)/dhcpctl/libdhcpctl.a \
|
|
|
8173a68 |
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
|
|
|
e83fb19 |
|
|
|
e83fb19 |
ATF_TESTS =
|
|
|
5ca2db2 |
if HAVE_ATF
|