kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

configure.ac: Use pkg-config to detect libxml2

Browse Source 
Use pkg-config to detect libxml2, falling back to xml2-config if the
former is not available.

This patch ensures Asterisk continues to build on systems without
xml2-config installed.

The patch also updates the associated 'configure' files.

ASTERISK-29970 #close

Change-Id: I3c90dfe0b0590486cbb8e6d426a7c5c4199410c0
This commit is contained in:
Hugh McMaster
2022-03-16 10:53:05 +11:00
committed by Friendly Automation
parent ed8ca6c38a
commit d132184520
4 changed files with 11861 additions and 9562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17756
configure vendored
View File

File diff suppressed because it is too large Load Diff

1
configure.ac
View File

@@ -737,6 +737,7 @@ fi
# See if clock_gettime is in librt # See if clock_gettime is in librt
AST_EXT_LIB_CHECK([RT], [rt], [clock_gettime], []) AST_EXT_LIB_CHECK([RT], [rt], [clock_gettime], [])
AST_PKG_CONFIG_CHECK([LIBXML2], [libxml-2.0])
AST_EXT_TOOL_CHECK([LIBXML2], [xml2-config], , , AST_EXT_TOOL_CHECK([LIBXML2], [xml2-config], , ,
[#include <libxml/tree.h> [#include <libxml/tree.h>
#include <libxml/parser.h>], #include <libxml/parser.h>],

3664
menuselect/configure vendored
View File

File diff suppressed because it is too large Load Diff

2
menuselect/configure.ac
View File

@@ -45,6 +45,7 @@ AH_BOTTOM([#endif])
AC_PROG_CC AC_PROG_CC
AST_CHECK_GNU_MAKE AST_CHECK_GNU_MAKE
PKG_PROG_PKG_CONFIG
AC_LANG(C) AC_LANG(C)
AC_ARG_ENABLE([debug], AC_ARG_ENABLE([debug],
@@ -90,6 +91,7 @@ else
AST_EXT_LIB_CHECK([TINFO], [tinfo], [keypad], [curses.h]) AST_EXT_LIB_CHECK([TINFO], [tinfo], [keypad], [curses.h])
fi fi
AST_PKG_CONFIG_CHECK([LIBXML2], [libxml-2.0])
AST_EXT_TOOL_CHECK([LIBXML2], [xml2-config], , , AST_EXT_TOOL_CHECK([LIBXML2], [xml2-config], , ,
[#include <libxml/tree.h> [#include <libxml/tree.h>
#include <libxml/parser.h>], #include <libxml/parser.h>],