1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162 |
- From 7107511fd209f08f9a96f8938041ae48f3295895 Mon Sep 17 00:00:00 2001
- From: Christopher Larson <chris_larson@mentor.com>
- Date: Tue, 15 Aug 2017 16:17:49 +0800
- Subject: [PATCH 07/11] Add configure argument to make the libxml2 dependency
- explicit and determinisitic.
- Upstream-Status: Pending
- Signed-off-by: Christopher Larson <chris_larson@mentor.com>
- Rebase to 4.3.6
- Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
- ---
- configure.ac | 11 +++++++++++
- 1 file changed, 11 insertions(+)
- Index: dhcp-4.4.3/configure.ac
- ===================================================================
- --- dhcp-4.4.3.orig/configure.ac
- +++ dhcp-4.4.3/configure.ac
- @@ -633,6 +633,17 @@ if test "$have_nanosleep" = "rt"; then
- LIBS="-lrt $LIBS"
- fi
-
- +AC_ARG_WITH(libxml2,
- + AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]),
- + with_libxml2="$withval", with_libxml2="no")
- +
- +if test x$with_libxml2 != xno; then
- + AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],
- + [if test x$with_libxml2 != xauto; then
- + AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
- + fi])
- +fi
- +
- # check for /dev/random (declares ISC_PATH_RANDOMDEV)
- AC_MSG_CHECKING(for random device)
- AC_ARG_WITH(randomdev,
- Index: dhcp-4.4.3/configure.ac+lt
- ===================================================================
- --- dhcp-4.4.3.orig/configure.ac+lt
- +++ dhcp-4.4.3/configure.ac+lt
- @@ -900,6 +900,18 @@ elif test "$want_libtool" = "yes" -a "$u
- fi
- AM_CONDITIONAL(INSTALL_BIND, test "$want_install_bind" = "yes")
-
- +AC_ARG_WITH(libxml2,
- + AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]),
- + with_libxml2="$withval", with_libxml2="no")
- +
- +if test x$with_libxml2 != xno; then
- + AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],,
- + [if test x$with_libxml2 != xauto; then
- + AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
- + fi])
- +fi
- +
- +
- # OpenLDAP support.
- AC_ARG_WITH(ldap,
- AS_HELP_STRING([--with-ldap],[enable OpenLDAP support in dhcpd (default is no)]),
|