From 525df998831a773c51bc1696fbdcaf3b542f6974 Mon Sep 17 00:00:00 2001
From: Kinsey Moore <kmoore@digium.com>
Date: Thu, 1 Aug 2013 17:23:10 +0000
Subject: [PATCH] Regenerate configure for configure.ac changes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395998 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
configure | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 145 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index a0e9502b6b..8ccfaa0031 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 392970 .
+# From configure.ac Revision: 395985 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for asterisk trunk.
#
@@ -967,6 +967,10 @@ PBX_LTDL
LTDL_DIR
LTDL_INCLUDE
LTDL_LIB
+PBX_LIBXSLT
+LIBXSLT_DIR
+LIBXSLT_INCLUDE
+LIBXSLT_LIB
PBX_LIBXML2
LIBXML2_DIR
LIBXML2_INCLUDE
@@ -1273,6 +1277,7 @@ with_ldap
with_libcurl
with_libedit
with_libxml2
+with_libxslt
with_ltdl
with_lua
with_misdn
@@ -2008,6 +2013,7 @@ Optional Packages:
--with-libedit=PATH use NetBSD Editline library files in PATH, use
'internal' Editline otherwise
--with-libxml2=PATH use LibXML2 files in PATH
+ --with-libxslt=PATH use LibXSLT files in PATH
--with-ltdl=PATH use libtool files in PATH
--with-lua=PATH use Lua files in PATH
--with-misdn=PATH use mISDN user files in PATH
@@ -9515,6 +9521,38 @@ fi
+ LIBXSLT_DESCRIP="LibXSLT"
+ LIBXSLT_OPTION="libxslt"
+ PBX_LIBXSLT=0
+
+# Check whether --with-libxslt was given.
+if test "${with_libxslt+set}" = set; then :
+ withval=$with_libxslt;
+ case ${withval} in
+ n|no)
+ USE_LIBXSLT=no
+ # -1 is a magic value used by menuselect to know that the package
+ # was disabled, other than 'not found'
+ PBX_LIBXSLT=-1
+ ;;
+ y|ye|yes)
+ ac_mandatory_list="${ac_mandatory_list} LIBXSLT"
+ ;;
+ *)
+ LIBXSLT_DIR="${withval}"
+ ac_mandatory_list="${ac_mandatory_list} LIBXSLT"
+ ;;
+ esac
+
+fi
+
+
+
+
+
+
+
+
LTDL_DESCRIP="libtool"
LTDL_OPTION="ltdl"
PBX_LTDL=0
@@ -12685,6 +12723,112 @@ $as_echo "$as_me: *** Please run the 'configure' script with the '--disable-xmld
$as_echo "$as_me: *** or install the 'libxml2' development package." >&6;}
exit 1
fi
+
+
+if test "x${PBX_LIBXSLT}" != "x1" -a "${USE_LIBXSLT}" != "no"; then
+ pbxlibdir=""
+ # if --with-LIBXSLT=DIR has been specified, use it.
+ if test "x${LIBXSLT_DIR}" != "x"; then
+ if test -d ${LIBXSLT_DIR}/lib; then
+ pbxlibdir="-L${LIBXSLT_DIR}/lib"
+ else
+ pbxlibdir="-L${LIBXSLT_DIR}"
+ fi
+ fi
+ pbxfuncname="xsltLoadStylesheetPI"
+ if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
+ AST_LIBXSLT_FOUND=yes
+ else
+ ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
+ CFLAGS="${CFLAGS} ${LIBXML2_INCLUDE}"
+ as_ac_Lib=`$as_echo "ac_cv_lib_xslt_${pbxfuncname}" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lxslt" >&5
+$as_echo_n "checking for ${pbxfuncname} in -lxslt... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lxslt ${pbxlibdir} ${LIBXML2_LIB} $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ${pbxfuncname} ();
+int
+main ()
+{
+return ${pbxfuncname} ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
+else
+ eval "$as_ac_Lib=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ AST_LIBXSLT_FOUND=yes
+else
+ AST_LIBXSLT_FOUND=no
+fi
+
+ CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
+ fi
+
+ # now check for the header.
+ if test "${AST_LIBXSLT_FOUND}" = "yes"; then
+ LIBXSLT_LIB="${pbxlibdir} -lxslt ${LIBXML2_LIB}"
+ # if --with-LIBXSLT=DIR has been specified, use it.
+ if test "x${LIBXSLT_DIR}" != "x"; then
+ LIBXSLT_INCLUDE="-I${LIBXSLT_DIR}/include"
+ fi
+ LIBXSLT_INCLUDE="${LIBXSLT_INCLUDE} ${LIBXML2_INCLUDE}"
+ if test "xlibxslt/xsltInternals.h" = "x" ; then # no header, assume found
+ LIBXSLT_HEADER_FOUND="1"
+ else # check for the header
+ ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} ${LIBXSLT_INCLUDE}"
+ ac_fn_c_check_header_mongrel "$LINENO" "libxslt/xsltInternals.h" "ac_cv_header_libxslt_xsltInternals_h" "$ac_includes_default"
+if test "x$ac_cv_header_libxslt_xsltInternals_h" = xyes; then :
+ LIBXSLT_HEADER_FOUND=1
+else
+ LIBXSLT_HEADER_FOUND=0
+fi
+
+
+ CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
+ fi
+ if test "x${LIBXSLT_HEADER_FOUND}" = "x0" ; then
+ LIBXSLT_LIB=""
+ LIBXSLT_INCLUDE=""
+ else
+ if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
+ LIBXSLT_LIB=""
+ fi
+ PBX_LIBXSLT=1
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBXSLT 1
+_ACEOF
+
+ fi
+ fi
+fi
+
+
+
fi
# some embedded systems omit internationalization (locale) support
--
GitLab