summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch
blob: a291fdaf52fc6b45c20de6cf1241a105e258dc62 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
Upstream-Status: Pending

11/30/2010
--with-libbind=PATH is available but not used by Makefile,
this patch is to allow building with external bind

Signed-off-by: Qing He <qing.he@intel.com>

Index: dhcp-4.3.0/Makefile.am
===================================================================
--- dhcp-4.3.0.orig/Makefile.am
+++ dhcp-4.3.0/Makefile.am
@@ -25,7 +25,7 @@ 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
+SUBDIRS = includes tests common dst omapip client dhcpctl relay server
 
 nobase_include_HEADERS = dhcpctl/dhcpctl.h
 
Index: dhcp-4.3.0/client/Makefile.am
===================================================================
--- dhcp-4.3.0.orig/client/Makefile.am
+++ dhcp-4.3.0/client/Makefile.am
@@ -4,8 +4,8 @@ dhclient_SOURCES = clparse.c dhclient.c
 		   scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
 		   scripts/netbsd scripts/nextstep scripts/openbsd \
 		   scripts/solaris scripts/openwrt
-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../bind/lib/libirs.a \
-		 ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a
+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(libbind)/libirs.a \
+		 $(libbind)/libdns.a $(libbind)/libisccfg.a $(libbind)/libisc.a
 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
 EXTRA_DIST = $(man_MANS)
 
Index: dhcp-4.3.0/configure.ac
===================================================================
--- dhcp-4.3.0.orig/configure.ac
+++ dhcp-4.3.0/configure.ac
@@ -566,6 +566,7 @@ no)
 	libbind="$use_libbind"
 	;;
 esac
+AC_SUBST([libbind])
 
 # OpenLDAP support.
 AC_ARG_WITH(ldap,
Index: dhcp-4.3.0/dhcpctl/Makefile.am
===================================================================
--- dhcp-4.3.0.orig/dhcpctl/Makefile.am
+++ dhcp-4.3.0/dhcpctl/Makefile.am
@@ -6,12 +6,12 @@ EXTRA_DIST = $(man_MANS)
 
 omshell_SOURCES = omshell.c
 omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
-	        ../bind/lib/libirs.a ../bind/lib/libdns.a \
-	        ../bind/lib/libisccfg.a ../bind/lib/libisc.a
+	        $(libbind)/libirs.a $(libbind)/libdns.a \
+	        $(libbind)/libisccfg.a $(libbind)/libisc.a
 
 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/libirs.a ../bind/lib/libdns.a \
-               ../bind/lib/libisccfg.a ../bind/lib/libisc.a
+	       $(libbind)/libirs.a $(libbind)/libdns.a \
+               $(libbind)/libisccfg.a $(libbind)/libisc.a
Index: dhcp-4.3.0/omapip/Makefile.am
===================================================================
--- dhcp-4.3.0.orig/omapip/Makefile.am
+++ dhcp-4.3.0/omapip/Makefile.am
@@ -10,6 +10,6 @@ man_MANS = omapi.3
 EXTRA_DIST = $(man_MANS)
 
 svtest_SOURCES = test.c
-svtest_LDADD = libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \
-		../bind/lib/libisccfg.a ../bind/lib/libisc.a
+svtest_LDADD = libomapi.a $(libbind)/libirs.a $(libbind)/libdns.a \
+		$(libbind)/libisccfg.a $(libbind)/libisc.a
 
Index: dhcp-4.3.0/relay/Makefile.am
===================================================================
--- dhcp-4.3.0.orig/relay/Makefile.am
+++ dhcp-4.3.0/relay/Makefile.am
@@ -3,8 +3,8 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
 sbin_PROGRAMS = dhcrelay
 dhcrelay_SOURCES = dhcrelay.c
 dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
-		 ../bind/lib/libirs.a ../bind/lib/libdns.a \
-		 ../bind/lib/libisccfg.a ../bind/lib/libisc.a
+		 $(libbind)/libirs.a $(libbind)/libdns.a \
+		 $(libbind)/libisccfg.a $(libbind)/libisc.a
 man_MANS = dhcrelay.8
 EXTRA_DIST = $(man_MANS)
 
Index: dhcp-4.3.0/server/Makefile.am
===================================================================
--- dhcp-4.3.0.orig/server/Makefile.am
+++ dhcp-4.3.0/server/Makefile.am
@@ -14,8 +14,8 @@ 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/libirs.a \
-	      ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a
+	      ../dhcpctl/libdhcpctl.a $(libbind)/libirs.a \
+	      $(libbind)/libdns.a $(libbind)/libisccfg.a $(libbind)/libisc.a
 
 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
 EXTRA_DIST = $(man_MANS)