From e55a27bcacef22b30910374a284b4b568c125bb0 Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Thu, 23 May 2019 22:55:46 +0200 Subject: [PATCH] Check for libxml2 include files, not lib in code --- apps/backend/backend_main.c | 4 ++-- apps/cli/cli_main.c | 4 ++-- lib/src/clixon_regex.c | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c index b8110db1..e77773fc 100644 --- a/apps/backend/backend_main.c +++ b/apps/backend/backend_main.c @@ -497,9 +497,9 @@ main(int argc, if (help) usage(h, argv[0]); -#ifndef HAVE_LIBXML2 +#ifndef HAVE_LIBXML_XMLREGEXP_H if (strcmp(clicon_yang_regexp(h), "libxml2")==0){ - clicon_err(OE_FATAL, 0, "CLICON_YANG_REGEXP set to libxml2, but HAVE_LIBXM2 not set (Either change CLICON_YANG_REGEXP to posix, or install libxml2?))"); + clicon_err(OE_FATAL, 0, "CLICON_YANG_REGEXP set to libxml2, but HAVE_LIBXM_XMLREGEXP_H not set (Either change CLICON_YANG_REGEXP to posix, or configure with libxml2?))"); goto done; } #endif diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c index de7c7a17..7401f74a 100644 --- a/apps/cli/cli_main.c +++ b/apps/cli/cli_main.c @@ -447,11 +447,11 @@ main(int argc, char **argv) usage(h, argv[0]); if (strcmp(clicon_yang_regexp(h), "libxml2")==0){ -#ifdef HAVE_LIBXML2 +#ifdef HAVE_LIBXML_XMLREGEXP_H /* Enable XSD libxml2 */ cligen_regex_set(cli_cligen(h), 1); #else - clicon_err(OE_FATAL, 0, "CLICON_YANG_REGEXP set to libxml2, but HAVE_LIBXM2 not set (Either change CLICON_YANG_REGEXP to posix, or install libxml2?))"); + clicon_err(OE_FATAL, 0, "CLICON_YANG_REGEXP set to libxml2, but HAVE_LIBXML_XMLREGEXP_H not set (Either change CLICON_YANG_REGEXP to posix, or configure with libxml2))"); goto done; #endif } diff --git a/lib/src/clixon_regex.c b/lib/src/clixon_regex.c index 602489ef..6e1b195b 100644 --- a/lib/src/clixon_regex.c +++ b/lib/src/clixon_regex.c @@ -49,10 +49,6 @@ #include #include -#ifdef HAVE_LIBXML_XMLREGEXP_H -#include -#endif - #include /* clicon */