| Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 1 | From a08acdfadb5eba2a3201209c6da3ad6f2ca4ae79 Mon Sep 17 00:00:00 2001 |
| 2 | From: Craig Comstock <craig.comstock@northern.tech> |
| 3 | Date: Fri, 27 Jan 2023 15:19:48 -0600 |
| 4 | Subject: [PATCH] Fixed --with-libxml2=no case in configure.ac |
| 5 | |
| 6 | The CF3_WITH_LIBRARY and AC_CHECK_HEADERS were moved to outside of the check for with-libxml2=no |
| 7 | |
| 8 | Ticket: CFE-4023 |
| 9 | Changelog: title |
| 10 | --- |
| 11 | configure.ac | 21 +++++++++++---------- |
| 12 | libntech/configure.ac | 21 +++++++++++---------- |
| 13 | 2 files changed, 22 insertions(+), 20 deletions(-) |
| 14 | |
| 15 | diff --git a/configure.ac b/configure.ac |
| 16 | index e189b10..f6b8226 100644 |
| 17 | --- a/configure.ac |
| 18 | +++ b/configure.ac |
| 19 | @@ -659,19 +659,20 @@ if test "x$with_libxml2" != "xno"; then |
| 20 | LIBXML2_CPPFLAGS=-I$with_libxml2/include/libxml2 |
| 21 | fi |
| 22 | fi |
| 23 | -fi |
| 24 | |
| 25 | -CF3_WITH_LIBRARY(libxml2, |
| 26 | - [AC_CHECK_LIB(xml2, xmlFirstElementChild, |
| 27 | - [], |
| 28 | - [if test "x$with_libxml2" != xcheck; then |
| 29 | - AC_MSG_ERROR(Cannot find libxml2); fi] |
| 30 | - ) |
| 31 | - AC_CHECK_HEADERS([libxml/xmlwriter.h], [break], |
| 32 | + CF3_WITH_LIBRARY(libxml2, |
| 33 | + [AC_CHECK_LIB(xml2, xmlFirstElementChild, |
| 34 | + [], |
| 35 | [if test "x$with_libxml2" != xcheck; then |
| 36 | AC_MSG_ERROR(Cannot find libxml2); fi] |
| 37 | - )] |
| 38 | -) |
| 39 | + ) |
| 40 | + AC_CHECK_HEADERS([libxml/xmlwriter.h], [break], |
| 41 | + [if test "x$with_libxml2" != xcheck; then |
| 42 | + AC_MSG_ERROR(Cannot find libxml2); fi] |
| 43 | + )] |
| 44 | + ) |
| 45 | + |
| 46 | +fi |
| 47 | |
| 48 | AM_CONDITIONAL([HAVE_LIBXML2], |
| 49 | [test "x$with_libxml2" != xno && |
| 50 | diff --git a/libntech/configure.ac b/libntech/configure.ac |
| 51 | index 7bb8787..28b3683 100644 |
| 52 | --- a/libntech/configure.ac |
| 53 | +++ b/libntech/configure.ac |
| 54 | @@ -571,19 +571,20 @@ if test "x$with_libxml2" != "xno"; then |
| 55 | LIBXML2_CPPFLAGS=-I$with_libxml2/include/libxml2 |
| 56 | fi |
| 57 | fi |
| 58 | -fi |
| 59 | |
| 60 | -CF3_WITH_LIBRARY(libxml2, |
| 61 | - [AC_CHECK_LIB(xml2, xmlFirstElementChild, |
| 62 | - [], |
| 63 | - [if test "x$with_libxml2" != xcheck; then |
| 64 | - AC_MSG_ERROR(Cannot find libxml2); fi] |
| 65 | - ) |
| 66 | - AC_CHECK_HEADERS([libxml/xmlwriter.h], [break], |
| 67 | + CF3_WITH_LIBRARY(libxml2, |
| 68 | + [AC_CHECK_LIB(xml2, xmlFirstElementChild, |
| 69 | + [], |
| 70 | [if test "x$with_libxml2" != xcheck; then |
| 71 | AC_MSG_ERROR(Cannot find libxml2); fi] |
| 72 | - )] |
| 73 | -) |
| 74 | + ) |
| 75 | + AC_CHECK_HEADERS([libxml/xmlwriter.h], [break], |
| 76 | + [if test "x$with_libxml2" != xcheck; then |
| 77 | + AC_MSG_ERROR(Cannot find libxml2); fi] |
| 78 | + )] |
| 79 | + ) |
| 80 | + |
| 81 | +fi |
| 82 | |
| 83 | AM_CONDITIONAL([HAVE_LIBXML2], |
| 84 | [test "x$with_libxml2" != xno && |
| 85 | -- |
| 86 | 2.39.1 |
| 87 | |