Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 501543b3ef715488a142e3d301ff2733aa33eec7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Awais Belal <awais_belal@mentor.com> |
| 3 | Date: Wed, 25 Oct 2017 21:00:05 +0500 |
| 4 | Subject: [PATCH] dhcp: correct the intention for xml2 lib search |
| 5 | |
| 6 | A missing case breaks the build when libxml2 is |
| 7 | required and found appropriately. The third argument |
| 8 | to the function AC_SEARCH_LIB is action-if-found which |
| 9 | was mistakenly been used for the case where the library |
| 10 | is not found and hence breaks the configure phase |
| 11 | where it shoud actually pass. |
| 12 | We now pass on silently when action-if-found is |
| 13 | executed. |
| 14 | |
| 15 | Upstream-Status: Pending |
| 16 | |
| 17 | Signed-off-by: Awais Belal <awais_belal@mentor.com> |
| 18 | --- |
| 19 | configure.ac | 2 +- |
| 20 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 21 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 22 | Index: dhcp-4.4.1/configure.ac |
| 23 | =================================================================== |
| 24 | --- dhcp-4.4.1.orig/configure.ac |
| 25 | +++ dhcp-4.4.1/configure.ac |
| 26 | @@ -647,7 +647,7 @@ AC_ARG_WITH(libxml2, |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 27 | with_libxml2="$withval", with_libxml2="no") |
| 28 | |
| 29 | if test x$with_libxml2 != xno; then |
| 30 | - AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2], |
| 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]) |