You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
164 lines
6.4 KiB
164 lines
6.4 KiB
diff -up dhcp-4.2.5b1/client/Makefile.am.remove-bind dhcp-4.2.5b1/client/Makefile.am |
|
--- dhcp-4.2.5b1/client/Makefile.am.remove-bind 2012-12-05 02:17:38.000000000 +0100 |
|
+++ dhcp-4.2.5b1/client/Makefile.am 2012-12-17 16:20:58.692538252 +0100 |
|
@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c |
|
scripts/netbsd scripts/nextstep scripts/openbsd \ |
|
scripts/solaris scripts/openwrt |
|
dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ |
|
- ../bind/lib/libdns.a ../bind/lib/libisc.a |
|
+ $(BIND9_LIBDIR) -ldns-export -lisc-export |
|
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 |
|
EXTRA_DIST = $(man_MANS) |
|
|
|
diff -up dhcp-4.2.5b1/common/tests/Makefile.am.remove-bind dhcp-4.2.5b1/common/tests/Makefile.am |
|
--- dhcp-4.2.5b1/common/tests/Makefile.am.remove-bind 2012-12-05 02:17:38.000000000 +0100 |
|
+++ dhcp-4.2.5b1/common/tests/Makefile.am 2012-12-17 16:20:58.693538239 +0100 |
|
@@ -13,8 +13,8 @@ ATF_TESTS += alloc_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 ../../bind/lib/libdns.a \ |
|
- ../../bind/lib/libisc.a |
|
+ ../../omapip/libomapi.a \ |
|
+ $(BIND9_LIBDIR) -ldns-export -lisc-export |
|
|
|
check: $(ATF_TESTS) |
|
atf-run | atf-report |
|
diff -up dhcp-4.2.5b1/configure.ac.remove-bind dhcp-4.2.5b1/configure.ac |
|
--- dhcp-4.2.5b1/configure.ac.remove-bind 2012-12-05 02:18:44.000000000 +0100 |
|
+++ dhcp-4.2.5b1/configure.ac 2012-12-17 16:20:58.693538239 +0100 |
|
@@ -581,20 +581,37 @@ AC_CHECK_MEMBER(struct msghdr.msg_contro |
|
libbind= |
|
AC_ARG_WITH(libbind, |
|
AC_HELP_STRING([--with-libbind=PATH], |
|
- [bind includes and libraries are in PATH |
|
- (default is ./bind)]), |
|
+ [bind includes are in PATH |
|
+ (default is ./bind/includes)]), |
|
use_libbind="$withval", use_libbind="no") |
|
case "$use_libbind" in |
|
+yes|no) |
|
+ libbind="\${top_srcdir}/bind/include" |
|
+ ;; |
|
+*) |
|
+ libbind="$use_libbind" |
|
+ ;; |
|
+esac |
|
+ |
|
+BIND9_LIBDIR='-L$(top_builddir)/bind/lib' |
|
+AC_ARG_WITH(libbind-libs, |
|
+ AC_HELP_STRING([--with-libbind-libs=PATH], |
|
+ [bind9 export libraries are in PATH]), |
|
+ [libbind_libs="$withval"], [libbind_libs='no']) |
|
+case "$libbind_libs" in |
|
yes) |
|
- libbind="\${top_srcdir}/bind" |
|
+ AC_MSG_ERROR([Specify path to bind9 libraries]) |
|
;; |
|
no) |
|
- libbind="\${top_srcdir}/bind" |
|
+ BUNDLED_BIND=yes |
|
;; |
|
*) |
|
- libbind="$use_libbind" |
|
+ BIND9_LIBDIR="-L$libbind_libs" |
|
+ BUNDLED_BIND=no |
|
;; |
|
esac |
|
+AM_CONDITIONAL([BUNDLED_BIND], [test "$BUNDLED_BIND" = yes]) |
|
+AC_SUBST([BIND9_LIBDIR]) |
|
|
|
# OpenLDAP support. |
|
AC_ARG_WITH(ldap, |
|
@@ -631,7 +648,7 @@ fi |
|
CFLAGS="$CFLAGS $STD_CWARNINGS" |
|
|
|
# Try to add the bind include directory |
|
-CFLAGS="$CFLAGS -I$libbind/include" |
|
+CFLAGS="$CFLAGS -I$libbind" |
|
|
|
AC_C_FLEXIBLE_ARRAY_MEMBER |
|
|
|
diff -up dhcp-4.2.5b1/dhcpctl/Makefile.am.remove-bind dhcp-4.2.5b1/dhcpctl/Makefile.am |
|
--- dhcp-4.2.5b1/dhcpctl/Makefile.am.remove-bind 2012-12-05 02:17:39.000000000 +0100 |
|
+++ dhcp-4.2.5b1/dhcpctl/Makefile.am 2012-12-17 16:20:58.693538239 +0100 |
|
@@ -6,10 +6,10 @@ EXTRA_DIST = $(man_MANS) |
|
|
|
omshell_SOURCES = omshell.c |
|
omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ |
|
- ../bind/lib/libdns.a ../bind/lib/libisc.a |
|
+ $(BIND9_LIBDIR) -ldns-export -lisc-export |
|
|
|
libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c |
|
|
|
cltest_SOURCES = cltest.c |
|
cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ |
|
- ../bind/lib/libdns.a ../bind/lib/libisc.a |
|
\ No newline at end of file |
|
+ $(BIND9_LIBDIR) -ldns-export -lisc-export |
|
diff -up dhcp-4.2.5b1/Makefile.am.remove-bind dhcp-4.2.5b1/Makefile.am |
|
--- dhcp-4.2.5b1/Makefile.am.remove-bind 2012-12-05 02:17:38.000000000 +0100 |
|
+++ dhcp-4.2.5b1/Makefile.am 2012-12-17 16:20:58.693538239 +0100 |
|
@@ -22,7 +22,13 @@ EXTRA_DIST = RELNOTES LICENSE \ |
|
bind/Makefile bind/bind.tar.gz bind/version.tmp \ |
|
common/tests/Atffile server/tests/Atffile |
|
|
|
-SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server |
|
+if BUNDLED_BIND |
|
+SUBDIRS = bind |
|
+else |
|
+SUBDIRS = |
|
+endif |
|
+ |
|
+SUBDIRS += includes tests common dst omapip client dhcpctl relay server |
|
|
|
nobase_include_HEADERS = dhcpctl/dhcpctl.h |
|
|
|
diff -up dhcp-4.2.5b1/omapip/Makefile.am.remove-bind dhcp-4.2.5b1/omapip/Makefile.am |
|
--- dhcp-4.2.5b1/omapip/Makefile.am.remove-bind 2012-12-05 02:17:39.000000000 +0100 |
|
+++ dhcp-4.2.5b1/omapip/Makefile.am 2012-12-17 16:20:58.693538239 +0100 |
|
@@ -10,5 +10,5 @@ man_MANS = omapi.3 |
|
EXTRA_DIST = $(man_MANS) |
|
|
|
svtest_SOURCES = test.c |
|
-svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a |
|
+svtest_LDADD = libomapi.a $(BIND9_LIBDIR) -ldns-export -lisc-export |
|
|
|
diff -up dhcp-4.2.5b1/relay/Makefile.am.remove-bind dhcp-4.2.5b1/relay/Makefile.am |
|
--- dhcp-4.2.5b1/relay/Makefile.am.remove-bind 2012-12-05 02:17:39.000000000 +0100 |
|
+++ dhcp-4.2.5b1/relay/Makefile.am 2012-12-17 16:20:58.694538225 +0100 |
|
@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst |
|
sbin_PROGRAMS = dhcrelay |
|
dhcrelay_SOURCES = dhcrelay.c |
|
dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ |
|
- ../bind/lib/libdns.a ../bind/lib/libisc.a |
|
+ $(BIND9_LIBDIR) -ldns-export -lisc-export |
|
man_MANS = dhcrelay.8 |
|
EXTRA_DIST = $(man_MANS) |
|
|
|
diff -up dhcp-4.2.5b1/server/Makefile.am.remove-bind dhcp-4.2.5b1/server/Makefile.am |
|
--- dhcp-4.2.5b1/server/Makefile.am.remove-bind 2012-12-05 02:17:39.000000000 +0100 |
|
+++ dhcp-4.2.5b1/server/Makefile.am 2012-12-17 16:20:58.694538225 +0100 |
|
@@ -14,8 +14,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c |
|
|
|
dhcpd_CFLAGS = $(LDAP_CFLAGS) |
|
dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ |
|
- ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \ |
|
- ../bind/lib/libisc.a |
|
+ ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export |
|
|
|
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 |
|
EXTRA_DIST = $(man_MANS) |
|
diff -up dhcp-4.2.5b1/server/tests/Makefile.am.remove-bind dhcp-4.2.5b1/server/tests/Makefile.am |
|
--- dhcp-4.2.5b1/server/tests/Makefile.am.remove-bind 2012-12-05 02:17:39.000000000 +0100 |
|
+++ dhcp-4.2.5b1/server/tests/Makefile.am 2012-12-17 16:26:01.093346768 +0100 |
|
@@ -18,8 +18,7 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa |
|
../ldap.c ../ldap_casa.c ../dhcpd.c |
|
|
|
DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \ |
|
- $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/bind/lib/libdns.a \ |
|
- $(top_builddir)/bind/lib/libisc.a |
|
+ $(top_builddir)/dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export |
|
|
|
ATF_TESTS = |
|
TESTS =
|
|
|