| From a08acdfadb5eba2a3201209c6da3ad6f2ca4ae79 Mon Sep 17 00:00:00 2001 |
| From: Craig Comstock <craig.comstock@northern.tech> |
| Date: Fri, 27 Jan 2023 15:19:48 -0600 |
| Subject: [PATCH] Fixed --with-libxml2=no case in configure.ac |
| |
| The CF3_WITH_LIBRARY and AC_CHECK_HEADERS were moved to outside of the check for with-libxml2=no |
| |
| Ticket: CFE-4023 |
| Changelog: title |
| --- |
| configure.ac | 21 +++++++++++---------- |
| libntech/configure.ac | 21 +++++++++++---------- |
| 2 files changed, 22 insertions(+), 20 deletions(-) |
| |
| diff --git a/configure.ac b/configure.ac |
| index e189b10..f6b8226 100644 |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -659,19 +659,20 @@ if test "x$with_libxml2" != "xno"; then |
| LIBXML2_CPPFLAGS=-I$with_libxml2/include/libxml2 |
| fi |
| fi |
| -fi |
| |
| -CF3_WITH_LIBRARY(libxml2, |
| - [AC_CHECK_LIB(xml2, xmlFirstElementChild, |
| - [], |
| - [if test "x$with_libxml2" != xcheck; then |
| - AC_MSG_ERROR(Cannot find libxml2); fi] |
| - ) |
| - AC_CHECK_HEADERS([libxml/xmlwriter.h], [break], |
| + CF3_WITH_LIBRARY(libxml2, |
| + [AC_CHECK_LIB(xml2, xmlFirstElementChild, |
| + [], |
| [if test "x$with_libxml2" != xcheck; then |
| AC_MSG_ERROR(Cannot find libxml2); fi] |
| - )] |
| -) |
| + ) |
| + AC_CHECK_HEADERS([libxml/xmlwriter.h], [break], |
| + [if test "x$with_libxml2" != xcheck; then |
| + AC_MSG_ERROR(Cannot find libxml2); fi] |
| + )] |
| + ) |
| + |
| +fi |
| |
| AM_CONDITIONAL([HAVE_LIBXML2], |
| [test "x$with_libxml2" != xno && |
| diff --git a/libntech/configure.ac b/libntech/configure.ac |
| index 7bb8787..28b3683 100644 |
| --- a/libntech/configure.ac |
| +++ b/libntech/configure.ac |
| @@ -571,19 +571,20 @@ if test "x$with_libxml2" != "xno"; then |
| LIBXML2_CPPFLAGS=-I$with_libxml2/include/libxml2 |
| fi |
| fi |
| -fi |
| |
| -CF3_WITH_LIBRARY(libxml2, |
| - [AC_CHECK_LIB(xml2, xmlFirstElementChild, |
| - [], |
| - [if test "x$with_libxml2" != xcheck; then |
| - AC_MSG_ERROR(Cannot find libxml2); fi] |
| - ) |
| - AC_CHECK_HEADERS([libxml/xmlwriter.h], [break], |
| + CF3_WITH_LIBRARY(libxml2, |
| + [AC_CHECK_LIB(xml2, xmlFirstElementChild, |
| + [], |
| [if test "x$with_libxml2" != xcheck; then |
| AC_MSG_ERROR(Cannot find libxml2); fi] |
| - )] |
| -) |
| + ) |
| + AC_CHECK_HEADERS([libxml/xmlwriter.h], [break], |
| + [if test "x$with_libxml2" != xcheck; then |
| + AC_MSG_ERROR(Cannot find libxml2); fi] |
| + )] |
| + ) |
| + |
| +fi |
| |
| AM_CONDITIONAL([HAVE_LIBXML2], |
| [test "x$with_libxml2" != xno && |
| -- |
| 2.39.1 |
| |