summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch b/meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch
deleted file mode 100644
index 14356621c0..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Add configure argument to make the libxml2 dependency explicit and
2determinisitic.
3
4Upstream-Status: Pending
5
6Signed-off-by: Christopher Larson <chris_larson@mentor.com>
7
8Rebase to 4.3.4
9Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10---
11 configure.ac | 11 ++++++++++-
12 1 file changed, 10 insertions(+), 1 deletion(-)
13
14diff --git a/configure.ac b/configure.ac
15index 726c88e..1684df1 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -718,7 +718,16 @@ AC_SUBST(BINDSRCDIR)
19
20 # We need to find libxml2 if bind was built with support enabled
21 # otherwise we'll fail to build omapip/test.c
22-AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],)
23+AC_ARG_WITH(libxml2,
24+ AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]),
25+ with_libxml2="$withval", with_libxml2="no")
26+
27+if test x$with_libxml2 != xno; then
28+ AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],
29+ [if test x$with_libxml2 != xauto; then
30+ AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
31+ fi])
32+fi
33
34 # OpenLDAP support.
35 AC_ARG_WITH(ldap,
36--
372.8.1
38