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 | |
| 9 | Index: dhcp-4.3.0/Makefile.am |
| 10 | =================================================================== |
| 11 | --- dhcp-4.3.0.orig/Makefile.am |
| 12 | +++ dhcp-4.3.0/Makefile.am |
| 13 | @@ -25,7 +25,7 @@ EXTRA_DIST = RELNOTES LICENSE \ |
| 14 | bind/Makefile bind/bind.tar.gz bind/version.tmp \ |
| 15 | common/tests/Atffile server/tests/Atffile |
| 16 | |
| 17 | -SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server |
| 18 | +SUBDIRS = includes tests common dst omapip client dhcpctl relay server |
| 19 | |
| 20 | nobase_include_HEADERS = dhcpctl/dhcpctl.h |
| 21 | |
| 22 | Index: dhcp-4.3.0/client/Makefile.am |
| 23 | =================================================================== |
| 24 | --- dhcp-4.3.0.orig/client/Makefile.am |
| 25 | +++ dhcp-4.3.0/client/Makefile.am |
| 26 | @@ -4,8 +4,8 @@ dhclient_SOURCES = clparse.c dhclient.c |
| 27 | scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ |
| 28 | scripts/netbsd scripts/nextstep scripts/openbsd \ |
| 29 | scripts/solaris scripts/openwrt |
| 30 | -dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../bind/lib/libirs.a \ |
| 31 | - ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a |
| 32 | +dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(libbind)/libirs.a \ |
| 33 | + $(libbind)/libdns.a $(libbind)/libisccfg.a $(libbind)/libisc.a |
| 34 | man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 |
| 35 | EXTRA_DIST = $(man_MANS) |
| 36 | |
| 37 | Index: dhcp-4.3.0/configure.ac |
| 38 | =================================================================== |
| 39 | --- dhcp-4.3.0.orig/configure.ac |
| 40 | +++ dhcp-4.3.0/configure.ac |
| 41 | @@ -566,6 +566,7 @@ no) |
| 42 | libbind="$use_libbind" |
| 43 | ;; |
| 44 | esac |
| 45 | +AC_SUBST([libbind]) |
| 46 | |
| 47 | # OpenLDAP support. |
| 48 | AC_ARG_WITH(ldap, |
| 49 | Index: dhcp-4.3.0/dhcpctl/Makefile.am |
| 50 | =================================================================== |
| 51 | --- dhcp-4.3.0.orig/dhcpctl/Makefile.am |
| 52 | +++ dhcp-4.3.0/dhcpctl/Makefile.am |
| 53 | @@ -6,12 +6,12 @@ EXTRA_DIST = $(man_MANS) |
| 54 | |
| 55 | omshell_SOURCES = omshell.c |
| 56 | omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ |
| 57 | - ../bind/lib/libirs.a ../bind/lib/libdns.a \ |
| 58 | - ../bind/lib/libisccfg.a ../bind/lib/libisc.a |
| 59 | + $(libbind)/libirs.a $(libbind)/libdns.a \ |
| 60 | + $(libbind)/libisccfg.a $(libbind)/libisc.a |
| 61 | |
| 62 | libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c |
| 63 | |
| 64 | cltest_SOURCES = cltest.c |
| 65 | cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ |
| 66 | - ../bind/lib/libirs.a ../bind/lib/libdns.a \ |
| 67 | - ../bind/lib/libisccfg.a ../bind/lib/libisc.a |
| 68 | + $(libbind)/libirs.a $(libbind)/libdns.a \ |
| 69 | + $(libbind)/libisccfg.a $(libbind)/libisc.a |
| 70 | Index: dhcp-4.3.0/omapip/Makefile.am |
| 71 | =================================================================== |
| 72 | --- dhcp-4.3.0.orig/omapip/Makefile.am |
| 73 | +++ dhcp-4.3.0/omapip/Makefile.am |
| 74 | @@ -10,6 +10,6 @@ man_MANS = omapi.3 |
| 75 | EXTRA_DIST = $(man_MANS) |
| 76 | |
| 77 | svtest_SOURCES = test.c |
| 78 | -svtest_LDADD = libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \ |
| 79 | - ../bind/lib/libisccfg.a ../bind/lib/libisc.a |
| 80 | +svtest_LDADD = libomapi.a $(libbind)/libirs.a $(libbind)/libdns.a \ |
| 81 | + $(libbind)/libisccfg.a $(libbind)/libisc.a |
| 82 | |
| 83 | Index: dhcp-4.3.0/relay/Makefile.am |
| 84 | =================================================================== |
| 85 | --- dhcp-4.3.0.orig/relay/Makefile.am |
| 86 | +++ dhcp-4.3.0/relay/Makefile.am |
| 87 | @@ -3,8 +3,8 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst |
| 88 | sbin_PROGRAMS = dhcrelay |
| 89 | dhcrelay_SOURCES = dhcrelay.c |
| 90 | dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ |
| 91 | - ../bind/lib/libirs.a ../bind/lib/libdns.a \ |
| 92 | - ../bind/lib/libisccfg.a ../bind/lib/libisc.a |
| 93 | + $(libbind)/libirs.a $(libbind)/libdns.a \ |
| 94 | + $(libbind)/libisccfg.a $(libbind)/libisc.a |
| 95 | man_MANS = dhcrelay.8 |
| 96 | EXTRA_DIST = $(man_MANS) |
| 97 | |
| 98 | Index: dhcp-4.3.0/server/Makefile.am |
| 99 | =================================================================== |
| 100 | --- dhcp-4.3.0.orig/server/Makefile.am |
| 101 | +++ dhcp-4.3.0/server/Makefile.am |
| 102 | @@ -14,8 +14,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c |
| 103 | |
| 104 | dhcpd_CFLAGS = $(LDAP_CFLAGS) |
| 105 | dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ |
| 106 | - ../dhcpctl/libdhcpctl.a ../bind/lib/libirs.a \ |
| 107 | - ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a |
| 108 | + ../dhcpctl/libdhcpctl.a $(libbind)/libirs.a \ |
| 109 | + $(libbind)/libdns.a $(libbind)/libisccfg.a $(libbind)/libisc.a |
| 110 | |
| 111 | man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 |
| 112 | EXTRA_DIST = $(man_MANS) |