Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Pending |
| 2 | |
| 3 | 11/30/2010 |
| 4 | --with-libbind=PATH is available but not used by Makefile, |
| 5 | this patch is to allow building with external bind |
| 6 | |
| 7 | Signed-off-by: Qing He <qing.he@intel.com> |
| 8 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9 | Rebase the patch to 4.3.3 |
| 10 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 11 | --- |
| 12 | diff --git a/Makefile.am b/Makefile.am |
| 13 | --- a/Makefile.am |
| 14 | +++ b/Makefile.am |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 15 | @@ -25,7 +25,7 @@ EXTRA_DIST = RELNOTES LICENSE \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 16 | bind/Makefile.in bind/bind.tar.gz bind/version.tmp \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 17 | common/tests/Atffile server/tests/Atffile |
| 18 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 19 | -SUBDIRS = bind includes tests common omapip client dhcpctl relay server |
| 20 | +SUBDIRS = includes tests common omapip client dhcpctl relay server |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 21 | |
| 22 | nobase_include_HEADERS = dhcpctl/dhcpctl.h |
| 23 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 24 | diff --git a/client/Makefile.am b/client/Makefile.am |
| 25 | --- a/client/Makefile.am |
| 26 | +++ b/client/Makefile.am |
| 27 | @@ -10,8 +10,8 @@ dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 28 | scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ |
| 29 | scripts/netbsd scripts/nextstep scripts/openbsd \ |
| 30 | scripts/solaris scripts/openwrt |
| 31 | -dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../bind/lib/libirs.a \ |
| 32 | - ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a |
| 33 | +dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(libbind)/libirs.a \ |
| 34 | + $(libbind)/libdns.a $(libbind)/libisccfg.a $(libbind)/libisc.a |
| 35 | man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 |
| 36 | EXTRA_DIST = $(man_MANS) |
| 37 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 38 | diff --git a/configure.ac b/configure.ac |
| 39 | --- a/configure.ac |
| 40 | +++ b/configure.ac |
| 41 | @@ -623,6 +623,7 @@ no) |
| 42 | fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 43 | ;; |
| 44 | esac |
| 45 | +AC_SUBST([libbind]) |
| 46 | |
| 47 | # OpenLDAP support. |
| 48 | AC_ARG_WITH(ldap, |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 49 | diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am |
| 50 | --- a/dhcpctl/Makefile.am |
| 51 | +++ b/dhcpctl/Makefile.am |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 52 | @@ -6,12 +6,12 @@ EXTRA_DIST = $(man_MANS) |
| 53 | |
| 54 | omshell_SOURCES = omshell.c |
| 55 | omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ |
| 56 | - ../bind/lib/libirs.a ../bind/lib/libdns.a \ |
| 57 | - ../bind/lib/libisccfg.a ../bind/lib/libisc.a |
| 58 | + $(libbind)/libirs.a $(libbind)/libdns.a \ |
| 59 | + $(libbind)/libisccfg.a $(libbind)/libisc.a |
| 60 | |
| 61 | libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c |
| 62 | |
| 63 | cltest_SOURCES = cltest.c |
| 64 | cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ |
| 65 | - ../bind/lib/libirs.a ../bind/lib/libdns.a \ |
| 66 | - ../bind/lib/libisccfg.a ../bind/lib/libisc.a |
| 67 | + $(libbind)/libirs.a $(libbind)/libdns.a \ |
| 68 | + $(libbind)/libisccfg.a $(libbind)/libisc.a |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 69 | diff --git a/omapip/Makefile.am b/omapip/Makefile.am |
| 70 | --- a/omapip/Makefile.am |
| 71 | +++ b/omapip/Makefile.am |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 72 | @@ -10,6 +10,6 @@ man_MANS = omapi.3 |
| 73 | EXTRA_DIST = $(man_MANS) |
| 74 | |
| 75 | svtest_SOURCES = test.c |
| 76 | -svtest_LDADD = libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \ |
| 77 | - ../bind/lib/libisccfg.a ../bind/lib/libisc.a |
| 78 | +svtest_LDADD = libomapi.a $(libbind)/libirs.a $(libbind)/libdns.a \ |
| 79 | + $(libbind)/libisccfg.a $(libbind)/libisc.a |
| 80 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 81 | diff --git a/relay/Makefile.am b/relay/Makefile.am |
| 82 | --- a/relay/Makefile.am |
| 83 | +++ b/relay/Makefile.am |
| 84 | @@ -3,8 +3,8 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 85 | sbin_PROGRAMS = dhcrelay |
| 86 | dhcrelay_SOURCES = dhcrelay.c |
| 87 | dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ |
| 88 | - ../bind/lib/libirs.a ../bind/lib/libdns.a \ |
| 89 | - ../bind/lib/libisccfg.a ../bind/lib/libisc.a |
| 90 | + $(libbind)/libirs.a $(libbind)/libdns.a \ |
| 91 | + $(libbind)/libisccfg.a $(libbind)/libisc.a |
| 92 | man_MANS = dhcrelay.8 |
| 93 | EXTRA_DIST = $(man_MANS) |
| 94 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 95 | diff --git a/server/Makefile.am b/server/Makefile.am |
| 96 | --- a/server/Makefile.am |
| 97 | +++ b/server/Makefile.am |
| 98 | @@ -14,10 +14,12 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 99 | |
| 100 | dhcpd_CFLAGS = $(LDAP_CFLAGS) |
| 101 | dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ |
| 102 | - ../dhcpctl/libdhcpctl.a ../bind/lib/libirs.a \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 103 | - ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 104 | + ../dhcpctl/libdhcpctl.a $(libbind)/libirs.a \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 105 | + $(libbind)/libdns.a $(libbind)/libisccfg.a $(libbind)/libisc.a \ |
| 106 | $(LDAP_LIBS) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 107 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 108 | + dhcpd_CFLAGS = $(LDAP_CFLAGS) |
| 109 | + |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 110 | man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 |
| 111 | EXTRA_DIST = $(man_MANS) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 112 | |
| 113 | -- |
| 114 | 1.9.1 |
| 115 | |