experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check for libxml2 include files, not lib in code

Browse source
This commit is contained in:
Olof hagsand 2019-05-23 22:55:46 +02:00
parent a804e05375
commit e55a27bcac
3 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/backend/backend_main.c
View file

@ -497,9 +497,9 @@ main(int argc,
if (help) if (help)
usage(h, argv[0]); usage(h, argv[0]);
#ifndef HAVE_LIBXML2 #ifndef HAVE_LIBXML_XMLREGEXP_H
if (strcmp(clicon_yang_regexp(h), "libxml2")==0){ 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; goto done;
} }
#endif #endif

4
apps/cli/cli_main.c
View file

@ -447,11 +447,11 @@ main(int argc, char **argv)
usage(h, argv[0]); usage(h, argv[0]);
if (strcmp(clicon_yang_regexp(h), "libxml2")==0){ if (strcmp(clicon_yang_regexp(h), "libxml2")==0){
#ifdef HAVE_LIBXML2 #ifdef HAVE_LIBXML_XMLREGEXP_H
/* Enable XSD libxml2 */ /* Enable XSD libxml2 */
cligen_regex_set(cli_cligen(h), 1); cligen_regex_set(cli_cligen(h), 1);
#else #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; goto done;
#endif #endif
} }

4
lib/src/clixon_regex.c
View file

@ -49,10 +49,6 @@
#include <regex.h> #include <regex.h>
#include <ctype.h> #include <ctype.h>
#ifdef HAVE_LIBXML_XMLREGEXP_H
#include <libxml/xmlregexp.h>
#endif
#include <cligen/cligen.h> #include <cligen/cligen.h>
/* clicon */ /* clicon */