diff options
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch')
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch b/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch deleted file mode 100644 index feb0754fff..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | From 7107511fd209f08f9a96f8938041ae48f3295895 Mon Sep 17 00:00:00 2001 | ||
2 | From: Christopher Larson <chris_larson@mentor.com> | ||
3 | Date: Tue, 15 Aug 2017 16:17:49 +0800 | ||
4 | Subject: [PATCH 07/11] Add configure argument to make the libxml2 dependency | ||
5 | explicit and determinisitic. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
10 | |||
11 | Rebase to 4.3.6 | ||
12 | |||
13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
14 | --- | ||
15 | configure.ac | 11 +++++++++++ | ||
16 | 1 file changed, 11 insertions(+) | ||
17 | |||
18 | Index: dhcp-4.4.1/configure.ac | ||
19 | =================================================================== | ||
20 | --- dhcp-4.4.1.orig/configure.ac | ||
21 | +++ dhcp-4.4.1/configure.ac | ||
22 | @@ -642,6 +642,17 @@ if test "$have_nanosleep" = "rt"; then | ||
23 | LIBS="-lrt $LIBS" | ||
24 | fi | ||
25 | |||
26 | +AC_ARG_WITH(libxml2, | ||
27 | + AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]), | ||
28 | + with_libxml2="$withval", with_libxml2="no") | ||
29 | + | ||
30 | +if test x$with_libxml2 != xno; then | ||
31 | + AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2], | ||
32 | + [if test x$with_libxml2 != xauto; then | ||
33 | + AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested]) | ||
34 | + fi]) | ||
35 | +fi | ||
36 | + | ||
37 | # check for /dev/random (declares HAVE_DEV_RANDOM) | ||
38 | AC_MSG_CHECKING(for random device) | ||
39 | AC_ARG_WITH(randomdev, | ||
40 | Index: dhcp-4.4.1/configure.ac+lt | ||
41 | =================================================================== | ||
42 | --- dhcp-4.4.1.orig/configure.ac+lt | ||
43 | +++ dhcp-4.4.1/configure.ac+lt | ||
44 | @@ -909,6 +909,18 @@ elif test "$want_libtool" = "yes" -a "$u | ||
45 | fi | ||
46 | AM_CONDITIONAL(INSTALL_BIND, test "$want_install_bind" = "yes") | ||
47 | |||
48 | +AC_ARG_WITH(libxml2, | ||
49 | + AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]), | ||
50 | + with_libxml2="$withval", with_libxml2="no") | ||
51 | + | ||
52 | +if test x$with_libxml2 != xno; then | ||
53 | + AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],, | ||
54 | + [if test x$with_libxml2 != xauto; then | ||
55 | + AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested]) | ||
56 | + fi]) | ||
57 | +fi | ||
58 | + | ||
59 | + | ||
60 | # OpenLDAP support. | ||
61 | AC_ARG_WITH(ldap, | ||
62 | AS_HELP_STRING([--with-ldap],[enable OpenLDAP support in dhcpd (default is no)]), | ||