diff --git a/autoconf/ast_c_compile_check.m4 b/autoconf/ast_c_compile_check.m4
index ed15630178bdd7a1ac785fb98232eab518433cf3..ebdaefa8994cd3159a7a4f8d52ac349243d841dd 100644
--- a/autoconf/ast_c_compile_check.m4
+++ b/autoconf/ast_c_compile_check.m4
@@ -4,11 +4,7 @@
AC_DEFUN([AST_C_COMPILE_CHECK],
[
if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
- if test "x$5" != "x"; then
- AC_MSG_CHECKING([for $5])
- else
- AC_MSG_CHECKING([if "$2" compiles using $3])
- fi
+ AC_MSG_CHECKING(m4_ifval([$5],[for $5],[if "$2" compiles using $3]))
saved_cppflags="${CPPFLAGS}"
if test "x${$1_DIR}" != "x"; then
$1_INCLUDE="-I${$1_DIR}/include"
diff --git a/autoconf/ast_check_pwlib.m4 b/autoconf/ast_check_pwlib.m4
index 81c3f408638faeda2932cfed618dca62445cd4e9..4588fa3b1129cac1303d51400fa02599267ab7d6 100644
--- a/autoconf/ast_check_pwlib.m4
+++ b/autoconf/ast_check_pwlib.m4
@@ -191,11 +191,7 @@ fi
])
AC_DEFUN([AST_CHECK_PWLIB_VERSION], [
- if test "x$7" != "x"; then
- VNAME="$7"
- else
- VNAME="$2_VERSION"
- fi
+ VNAME="m4_default([$7],[$2_VERSION])"
if test "${HAS_$2:-unset}" != "unset"; then
$2_VERSION=`grep "$VNAME \"" ${$2_INCDIR}/$3 | sed -e 's/[[[:space:]]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'`
@@ -204,11 +200,7 @@ AC_DEFUN([AST_CHECK_PWLIB_VERSION], [
$2_BUILD_NUMBER=`echo ${$2_VERSION} | cut -f3 -d.`
$2_VER=$((${$2_MAJOR_VERSION}*10000+${$2_MINOR_VERSION}*100+${$2_BUILD_NUMBER}))
$2_REQ=$(($4*10000+$5*100+$6))
- if test "x$10" = "x"; then
- $2_MAX=9999999
- else
- $2_MAX=$(($8*10000+$9*100+$10))
- fi
+ $2_MAX=m4_ifblank([$10], [9999999], [$(($8*10000+$9*100+$10))])
AC_MSG_CHECKING(if $1 version ${$2_VERSION} is compatible with chan_h323)
if test ${$2_VER} -lt ${$2_REQ}; then
diff --git a/autoconf/ast_ext_lib.m4 b/autoconf/ast_ext_lib.m4
index cd5a3a7793864c79468b1caf67235f2a30973d34..e8ce2013daa1fd153103c0b1d9af94424012caf7 100644
--- a/autoconf/ast_ext_lib.m4
+++ b/autoconf/ast_ext_lib.m4
@@ -117,15 +117,15 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
pbxlibdir="-L${$1_DIR}"
fi
fi
- pbxfuncname="$3"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
+ m4_ifblank([$3], [
+ # empty lib, assume only headers
AST_$1_FOUND=yes
- else
+ ], [
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} $6"
- AC_CHECK_LIB([$2], [${pbxfuncname}], [AST_$1_FOUND=yes], [AST_$1_FOUND=no], [${pbxlibdir} $5])
+ AC_CHECK_LIB([$2], [$3], [AST_$1_FOUND=yes], [AST_$1_FOUND=no], [${pbxlibdir} $5])
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+ ])
# now check for the header.
if test "${AST_$1_FOUND}" = "yes"; then
@@ -135,21 +135,24 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
$1_INCLUDE="-I${$1_DIR}/include"
fi
$1_INCLUDE="${$1_INCLUDE} $6"
- if test "x$4" = "x" ; then # no header, assume found
+ m4_ifblank([$4], [
+ # no header, assume found
$1_HEADER_FOUND="1"
- else # check for the header
+ ], [
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+ ])
if test "x${$1_HEADER_FOUND}" = "x0" ; then
$1_LIB=""
$1_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
+ m4_ifblank([$3], [
+ # only checking headers -> no library
$1_LIB=""
- fi
+ ])
PBX_$1=1
cat >>confdefs.h <<_ACEOF
[@%:@define] HAVE_$1 1
diff --git a/autoconf/ast_ext_tool_check.m4 b/autoconf/ast_ext_tool_check.m4
index 758720d24254cd61f5d8efef56a85805981e0aaf..ef762eb877b96c062aadab2e7d0c986eb8ccb540 100644
--- a/autoconf/ast_ext_tool_check.m4
+++ b/autoconf/ast_ext_tool_check.m4
@@ -10,15 +10,13 @@ AC_DEFUN([AST_EXT_TOOL_CHECK],
PBX_$1=0
AC_PATH_TOOL(CONFIG_$1, $2, No, [${$1_DIR}/bin:$PATH])
if test ! "x${CONFIG_$1}" = xNo; then
- if test x"$3" = x ; then A=--cflags ; else A="$3" ; fi
- $1_INCLUDE=$(${CONFIG_$1} $A)
+ $1_INCLUDE=$(${CONFIG_$1} m4_default([$3],[--cflags]))
$1_INCLUDE=$(echo ${$1_INCLUDE} | $SED -e "s|-I|-I${$1_DIR}|g")
- if test x"$4" = x ; then A=--libs ; else A="$4" ; fi
- $1_LIB=$(${CONFIG_$1} $A)
+ $1_LIB=$(${CONFIG_$1} m4_default([$4],[--libs]))
$1_LIB=$(echo ${$1_LIB} | $SED -e "s|-L|-L${$1_DIR}|g")
- if test x"$5" != x ; then
+ m4_ifval([$5], [
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
@@ -28,15 +26,15 @@ AC_DEFUN([AST_EXT_TOOL_CHECK],
AC_LINK_IFELSE(
[ AC_LANG_PROGRAM( [ $5 ], [ $6; ])],
[ PBX_$1=1 AC_DEFINE([HAVE_$1], 1,
- [Define if your system has the $1 headers.])],
+ [Define if your system has the $1 libraries.])],
[]
)
CPPFLAGS="${saved_cppflags}"
LIBS="${saved_libs}"
- else
+ ], [
PBX_$1=1
AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 libraries.])
- fi
+ ])
fi
fi
])
diff --git a/autoconf/ast_gcc_attribute.m4 b/autoconf/ast_gcc_attribute.m4
index b1972bedf38ecf5dd77fafb6004c3eab67b76060..9d5a32045f0ec76d3e0ea4fbb9de11ced312871b 100644
--- a/autoconf/ast_gcc_attribute.m4
+++ b/autoconf/ast_gcc_attribute.m4
@@ -9,28 +9,17 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
m4_ifval([$4],$4=0)
ax_cv_have_func_attribute_$1=0
-if test "x$2" = "x"
-then
AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM([$3 void __attribute__(($1)) *test(void *muffin, ...) {return (void *) 0;}],
- [])],
+ [AC_LANG_PROGRAM(
+ m4_ifblank([$2],
+ [$3 void __attribute__(($1)) *test(void *muffin, ...) {return (void *) 0;}],
+ [$3 void __attribute__(($2)) *test(void *muffin, ...) ;]))],
AC_MSG_RESULT(yes)
m4_ifval([$4],$4=1)
ax_cv_have_func_attribute_$1=1
AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]),
AC_MSG_RESULT(no)
)
-else
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM([$3 void __attribute__(($2)) *test(void *muffin, ...) ;],
- [])],
- AC_MSG_RESULT(yes)
- m4_ifval([$4],$4=1)
- ax_cv_have_func_attribute_$1=1
- AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]),
- AC_MSG_RESULT(no)
-)
-fi
m4_ifval([$4],[AC_SUBST($4)])
CFLAGS="$saved_CFLAGS"
diff --git a/configure b/configure
index 70b042f740c92790c706447eb8be5aebd3d72df5..c672df9712e49a6615816604bd24e2278f7e06cd 100755
--- a/configure
+++ b/configure
@@ -13619,16 +13619,12 @@ if test "x${PBX_TERMCAP}" != "x1" -a "${USE_TERMCAP}" != "no"; then
pbxlibdir="-L${TERMCAP_DIR}"
fi
fi
- pbxfuncname="tgetent"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_TERMCAP_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_termcap_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -ltermcap" >&5
-$as_echo_n "checking for ${pbxfuncname} in -ltermcap... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
+$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
+if ${ac_cv_lib_termcap_tgetent+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13642,35 +13638,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char tgetent ();
int
main ()
{
-return ${pbxfuncname} ();
+return tgetent ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_termcap_tgetent=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_termcap_tgetent=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
+$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
+if test "x$ac_cv_lib_termcap_tgetent" = xyes; then :
AST_TERMCAP_FOUND=yes
else
AST_TERMCAP_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_TERMCAP_FOUND}" = "yes"; then
@@ -13680,28 +13675,15 @@ fi
TERMCAP_INCLUDE="-I${TERMCAP_DIR}/include"
fi
TERMCAP_INCLUDE="${TERMCAP_INCLUDE} "
- if test "x" = "x" ; then # no header, assume found
- TERMCAP_HEADER_FOUND="1"
- else # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${TERMCAP_INCLUDE}"
- ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default"
-if test "x$ac_cv_header_" = xyes; then :
- TERMCAP_HEADER_FOUND=1
-else
- TERMCAP_HEADER_FOUND=0
-fi
+ # no header, assume found
+ TERMCAP_HEADER_FOUND="1"
- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
if test "x${TERMCAP_HEADER_FOUND}" = "x0" ; then
TERMCAP_LIB=""
TERMCAP_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- TERMCAP_LIB=""
- fi
+
PBX_TERMCAP=1
cat >>confdefs.h <<_ACEOF
#define HAVE_TERMCAP 1
@@ -13723,16 +13705,12 @@ if test "x${PBX_TINFO}" != "x1" -a "${USE_TINFO}" != "no"; then
pbxlibdir="-L${TINFO_DIR}"
fi
fi
- pbxfuncname="tgetent"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_TINFO_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_tinfo_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -ltinfo" >&5
-$as_echo_n "checking for ${pbxfuncname} in -ltinfo... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5
+$as_echo_n "checking for tgetent in -ltinfo... " >&6; }
+if ${ac_cv_lib_tinfo_tgetent+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13746,35 +13724,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char tgetent ();
int
main ()
{
-return ${pbxfuncname} ();
+return tgetent ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_tinfo_tgetent=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_tinfo_tgetent=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_tgetent" >&5
+$as_echo "$ac_cv_lib_tinfo_tgetent" >&6; }
+if test "x$ac_cv_lib_tinfo_tgetent" = xyes; then :
AST_TINFO_FOUND=yes
else
AST_TINFO_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_TINFO_FOUND}" = "yes"; then
@@ -13784,28 +13761,15 @@ fi
TINFO_INCLUDE="-I${TINFO_DIR}/include"
fi
TINFO_INCLUDE="${TINFO_INCLUDE} "
- if test "x" = "x" ; then # no header, assume found
- TINFO_HEADER_FOUND="1"
- else # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${TINFO_INCLUDE}"
- ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default"
-if test "x$ac_cv_header_" = xyes; then :
- TINFO_HEADER_FOUND=1
-else
- TINFO_HEADER_FOUND=0
-fi
+ # no header, assume found
+ TINFO_HEADER_FOUND="1"
- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
if test "x${TINFO_HEADER_FOUND}" = "x0" ; then
TINFO_LIB=""
TINFO_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- TINFO_LIB=""
- fi
+
PBX_TINFO=1
cat >>confdefs.h <<_ACEOF
#define HAVE_TINFO 1
@@ -13827,16 +13791,12 @@ if test "x${PBX_CURSES}" != "x1" -a "${USE_CURSES}" != "no"; then
pbxlibdir="-L${CURSES_DIR}"
fi
fi
- pbxfuncname="initscr"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_CURSES_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_curses_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcurses" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lcurses... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5
+$as_echo_n "checking for initscr in -lcurses... " >&6; }
+if ${ac_cv_lib_curses_initscr+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13850,35 +13810,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char initscr ();
int
main ()
{
-return ${pbxfuncname} ();
+return initscr ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_curses_initscr=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_curses_initscr=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_initscr" >&5
+$as_echo "$ac_cv_lib_curses_initscr" >&6; }
+if test "x$ac_cv_lib_curses_initscr" = xyes; then :
AST_CURSES_FOUND=yes
else
AST_CURSES_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_CURSES_FOUND}" = "yes"; then
@@ -13888,9 +13847,8 @@ fi
CURSES_INCLUDE="-I${CURSES_DIR}/include"
fi
CURSES_INCLUDE="${CURSES_INCLUDE} "
- if test "xcurses.h" = "x" ; then # no header, assume found
- CURSES_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${CURSES_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
@@ -13902,14 +13860,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${CURSES_HEADER_FOUND}" = "x0" ; then
CURSES_LIB=""
CURSES_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- CURSES_LIB=""
- fi
+
PBX_CURSES=1
cat >>confdefs.h <<_ACEOF
#define HAVE_CURSES 1
@@ -13931,16 +13887,12 @@ if test "x${PBX_NCURSES}" != "x1" -a "${USE_NCURSES}" != "no"; then
pbxlibdir="-L${NCURSES_DIR}"
fi
fi
- pbxfuncname="initscr"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_NCURSES_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_ncurses_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lncurses" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lncurses... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
+$as_echo_n "checking for initscr in -lncurses... " >&6; }
+if ${ac_cv_lib_ncurses_initscr+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13954,35 +13906,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char initscr ();
int
main ()
{
-return ${pbxfuncname} ();
+return initscr ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_ncurses_initscr=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_ncurses_initscr=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
+$as_echo "$ac_cv_lib_ncurses_initscr" >&6; }
+if test "x$ac_cv_lib_ncurses_initscr" = xyes; then :
AST_NCURSES_FOUND=yes
else
AST_NCURSES_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_NCURSES_FOUND}" = "yes"; then
@@ -13992,9 +13943,8 @@ fi
NCURSES_INCLUDE="-I${NCURSES_DIR}/include"
fi
NCURSES_INCLUDE="${NCURSES_INCLUDE} "
- if test "xcurses.h" = "x" ; then # no header, assume found
- NCURSES_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${NCURSES_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
@@ -14006,14 +13956,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${NCURSES_HEADER_FOUND}" = "x0" ; then
NCURSES_LIB=""
NCURSES_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- NCURSES_LIB=""
- fi
+
PBX_NCURSES=1
cat >>confdefs.h <<_ACEOF
#define HAVE_NCURSES 1
@@ -14054,16 +14002,12 @@ if test "x${PBX_LIBUUID}" != "x1" -a "${USE_LIBUUID}" != "no"; then
pbxlibdir="-L${LIBUUID_DIR}"
fi
fi
- pbxfuncname="uuid_generate_random"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_LIBUUID_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_uuid_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -luuid" >&5
-$as_echo_n "checking for ${pbxfuncname} in -luuid... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_random in -luuid" >&5
+$as_echo_n "checking for uuid_generate_random in -luuid... " >&6; }
+if ${ac_cv_lib_uuid_uuid_generate_random+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -14077,35 +14021,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char uuid_generate_random ();
int
main ()
{
-return ${pbxfuncname} ();
+return uuid_generate_random ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_uuid_uuid_generate_random=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_uuid_uuid_generate_random=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate_random" >&5
+$as_echo "$ac_cv_lib_uuid_uuid_generate_random" >&6; }
+if test "x$ac_cv_lib_uuid_uuid_generate_random" = xyes; then :
AST_LIBUUID_FOUND=yes
else
AST_LIBUUID_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_LIBUUID_FOUND}" = "yes"; then
@@ -14115,9 +14058,8 @@ fi
LIBUUID_INCLUDE="-I${LIBUUID_DIR}/include"
fi
LIBUUID_INCLUDE="${LIBUUID_INCLUDE} "
- if test "xuuid/uuid.h" = "x" ; then # no header, assume found
- LIBUUID_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LIBUUID_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
@@ -14129,14 +14071,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${LIBUUID_HEADER_FOUND}" = "x0" ; then
LIBUUID_LIB=""
LIBUUID_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- LIBUUID_LIB=""
- fi
+
PBX_LIBUUID=1
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBUUID 1
@@ -14158,16 +14098,12 @@ if test "x${PBX_E2FSUUID}" != "x1" -a "${USE_E2FSUUID}" != "no"; then
pbxlibdir="-L${E2FSUUID_DIR}"
fi
fi
- pbxfuncname="uuid_generate_random"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_E2FSUUID_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_e2fs-uuid_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -le2fs-uuid" >&5
-$as_echo_n "checking for ${pbxfuncname} in -le2fs-uuid... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_random in -le2fs-uuid" >&5
+$as_echo_n "checking for uuid_generate_random in -le2fs-uuid... " >&6; }
+if ${ac_cv_lib_e2fs_uuid_uuid_generate_random+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -14181,35 +14117,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char uuid_generate_random ();
int
main ()
{
-return ${pbxfuncname} ();
+return uuid_generate_random ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_e2fs_uuid_uuid_generate_random=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_e2fs_uuid_uuid_generate_random=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_e2fs_uuid_uuid_generate_random" >&5
+$as_echo "$ac_cv_lib_e2fs_uuid_uuid_generate_random" >&6; }
+if test "x$ac_cv_lib_e2fs_uuid_uuid_generate_random" = xyes; then :
AST_E2FSUUID_FOUND=yes
else
AST_E2FSUUID_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_E2FSUUID_FOUND}" = "yes"; then
@@ -14219,9 +14154,8 @@ fi
E2FSUUID_INCLUDE="-I${E2FSUUID_DIR}/include"
fi
E2FSUUID_INCLUDE="${E2FSUUID_INCLUDE} "
- if test "xuuid/uuid.h" = "x" ; then # no header, assume found
- E2FSUUID_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${E2FSUUID_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
@@ -14233,14 +14167,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${E2FSUUID_HEADER_FOUND}" = "x0" ; then
E2FSUUID_LIB=""
E2FSUUID_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- E2FSUUID_LIB=""
- fi
+
PBX_E2FSUUID=1
cat >>confdefs.h <<_ACEOF
#define HAVE_E2FSUUID 1
@@ -14292,16 +14224,12 @@ if test "x${PBX_JANSSON}" != "x1" -a "${USE_JANSSON}" != "no"; then
pbxlibdir="-L${JANSSON_DIR}"
fi
fi
- pbxfuncname="json_dumps"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_JANSSON_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_jansson_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -ljansson" >&5
-$as_echo_n "checking for ${pbxfuncname} in -ljansson... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for json_dumps in -ljansson" >&5
+$as_echo_n "checking for json_dumps in -ljansson... " >&6; }
+if ${ac_cv_lib_jansson_json_dumps+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -14315,35 +14243,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char json_dumps ();
int
main ()
{
-return ${pbxfuncname} ();
+return json_dumps ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_jansson_json_dumps=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_jansson_json_dumps=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jansson_json_dumps" >&5
+$as_echo "$ac_cv_lib_jansson_json_dumps" >&6; }
+if test "x$ac_cv_lib_jansson_json_dumps" = xyes; then :
AST_JANSSON_FOUND=yes
else
AST_JANSSON_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_JANSSON_FOUND}" = "yes"; then
@@ -14353,9 +14280,8 @@ fi
JANSSON_INCLUDE="-I${JANSSON_DIR}/include"
fi
JANSSON_INCLUDE="${JANSSON_INCLUDE} "
- if test "xjansson.h" = "x" ; then # no header, assume found
- JANSSON_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${JANSSON_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "jansson.h" "ac_cv_header_jansson_h" "$ac_includes_default"
@@ -14367,14 +14293,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${JANSSON_HEADER_FOUND}" = "x0" ; then
JANSSON_LIB=""
JANSSON_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- JANSSON_LIB=""
- fi
+
PBX_JANSSON=1
cat >>confdefs.h <<_ACEOF
#define HAVE_JANSSON 1
@@ -14402,16 +14326,12 @@ if test "x${PBX_RT}" != "x1" -a "${USE_RT}" != "no"; then
pbxlibdir="-L${RT_DIR}"
fi
fi
- pbxfuncname="clock_gettime"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_RT_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_rt_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lrt" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lrt... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
+$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
+if ${ac_cv_lib_rt_clock_gettime+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -14425,35 +14345,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char clock_gettime ();
int
main ()
{
-return ${pbxfuncname} ();
+return clock_gettime ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_rt_clock_gettime=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_rt_clock_gettime=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
+$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
+if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then :
AST_RT_FOUND=yes
else
AST_RT_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_RT_FOUND}" = "yes"; then
@@ -14463,28 +14382,15 @@ fi
RT_INCLUDE="-I${RT_DIR}/include"
fi
RT_INCLUDE="${RT_INCLUDE} "
- if test "x" = "x" ; then # no header, assume found
- RT_HEADER_FOUND="1"
- else # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${RT_INCLUDE}"
- ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default"
-if test "x$ac_cv_header_" = xyes; then :
- RT_HEADER_FOUND=1
-else
- RT_HEADER_FOUND=0
-fi
+ # no header, assume found
+ RT_HEADER_FOUND="1"
- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
if test "x${RT_HEADER_FOUND}" = "x0" ; then
RT_LIB=""
RT_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- RT_LIB=""
- fi
+
PBX_RT=1
cat >>confdefs.h <<_ACEOF
#define HAVE_RT 1
@@ -14600,16 +14506,13 @@ else
fi
if test ! "x${CONFIG_LIBXML2}" = xNo; then
- if test x"" = x ; then A=--cflags ; else A="" ; fi
- LIBXML2_INCLUDE=$(${CONFIG_LIBXML2} $A)
+ LIBXML2_INCLUDE=$(${CONFIG_LIBXML2} --cflags)
LIBXML2_INCLUDE=$(echo ${LIBXML2_INCLUDE} | $SED -e "s|-I|-I${LIBXML2_DIR}|g")
- if test x"" = x ; then A=--libs ; else A="" ; fi
- LIBXML2_LIB=$(${CONFIG_LIBXML2} $A)
+ LIBXML2_LIB=$(${CONFIG_LIBXML2} --libs)
LIBXML2_LIB=$(echo ${LIBXML2_LIB} | $SED -e "s|-L|-L${LIBXML2_DIR}|g")
- if test x"#include <libxml/tree.h>
- #include <libxml/parser.h>" != x ; then
+
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LIBXML2_INCLUDE}"
@@ -14637,12 +14540,7 @@ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CPPFLAGS="${saved_cppflags}"
LIBS="${saved_libs}"
- else
- PBX_LIBXML2=1
-
-$as_echo "#define HAVE_LIBXML2 1" >>confdefs.h
- fi
fi
fi
@@ -14666,16 +14564,12 @@ if test "x${PBX_URIPARSER}" != "x1" -a "${USE_URIPARSER}" != "no"; then
pbxlibdir="-L${URIPARSER_DIR}"
fi
fi
- pbxfuncname="uriParseUriA"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_URIPARSER_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_uriparser_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -luriparser" >&5
-$as_echo_n "checking for ${pbxfuncname} in -luriparser... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uriParseUriA in -luriparser" >&5
+$as_echo_n "checking for uriParseUriA in -luriparser... " >&6; }
+if ${ac_cv_lib_uriparser_uriParseUriA+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -14689,35 +14583,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char uriParseUriA ();
int
main ()
{
-return ${pbxfuncname} ();
+return uriParseUriA ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_uriparser_uriParseUriA=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_uriparser_uriParseUriA=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uriparser_uriParseUriA" >&5
+$as_echo "$ac_cv_lib_uriparser_uriParseUriA" >&6; }
+if test "x$ac_cv_lib_uriparser_uriParseUriA" = xyes; then :
AST_URIPARSER_FOUND=yes
else
AST_URIPARSER_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_URIPARSER_FOUND}" = "yes"; then
@@ -14727,9 +14620,8 @@ fi
URIPARSER_INCLUDE="-I${URIPARSER_DIR}/include"
fi
URIPARSER_INCLUDE="${URIPARSER_INCLUDE} "
- if test "xuriparser/Uri.h" = "x" ; then # no header, assume found
- URIPARSER_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${URIPARSER_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "uriparser/Uri.h" "ac_cv_header_uriparser_Uri_h" "$ac_includes_default"
@@ -14741,14 +14633,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${URIPARSER_HEADER_FOUND}" = "x0" ; then
URIPARSER_LIB=""
URIPARSER_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- URIPARSER_LIB=""
- fi
+
PBX_URIPARSER=1
cat >>confdefs.h <<_ACEOF
#define HAVE_URIPARSER 1
@@ -14789,16 +14679,12 @@ if test "x${PBX_LIBXSLT}" != "x1" -a "${USE_LIBXSLT}" != "no"; then
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 "$as_me:${as_lineno-$LINENO}: checking for xsltLoadStylesheetPI in -lxslt" >&5
+$as_echo_n "checking for xsltLoadStylesheetPI in -lxslt... " >&6; }
+if ${ac_cv_lib_xslt_xsltLoadStylesheetPI+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -14812,35 +14698,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char xsltLoadStylesheetPI ();
int
main ()
{
-return ${pbxfuncname} ();
+return xsltLoadStylesheetPI ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_xslt_xsltLoadStylesheetPI=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_xslt_xsltLoadStylesheetPI=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xslt_xsltLoadStylesheetPI" >&5
+$as_echo "$ac_cv_lib_xslt_xsltLoadStylesheetPI" >&6; }
+if test "x$ac_cv_lib_xslt_xsltLoadStylesheetPI" = xyes; 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
@@ -14850,9 +14735,8 @@ fi
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
+
+ # 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"
@@ -14864,14 +14748,12 @@ 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
@@ -14893,16 +14775,12 @@ if test "x${PBX_LIBXSLT_CLEANUP}" != "x1" -a "${USE_LIBXSLT_CLEANUP}" != "no"; t
pbxlibdir="-L${LIBXSLT_CLEANUP_DIR}"
fi
fi
- pbxfuncname="xsltCleanupGlobals"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_LIBXSLT_CLEANUP_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 "$as_me:${as_lineno-$LINENO}: checking for xsltCleanupGlobals in -lxslt" >&5
+$as_echo_n "checking for xsltCleanupGlobals in -lxslt... " >&6; }
+if ${ac_cv_lib_xslt_xsltCleanupGlobals+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -14916,35 +14794,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char xsltCleanupGlobals ();
int
main ()
{
-return ${pbxfuncname} ();
+return xsltCleanupGlobals ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_xslt_xsltCleanupGlobals=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_xslt_xsltCleanupGlobals=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xslt_xsltCleanupGlobals" >&5
+$as_echo "$ac_cv_lib_xslt_xsltCleanupGlobals" >&6; }
+if test "x$ac_cv_lib_xslt_xsltCleanupGlobals" = xyes; then :
AST_LIBXSLT_CLEANUP_FOUND=yes
else
AST_LIBXSLT_CLEANUP_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_LIBXSLT_CLEANUP_FOUND}" = "yes"; then
@@ -14954,9 +14831,8 @@ fi
LIBXSLT_CLEANUP_INCLUDE="-I${LIBXSLT_CLEANUP_DIR}/include"
fi
LIBXSLT_CLEANUP_INCLUDE="${LIBXSLT_CLEANUP_INCLUDE} ${LIBXML2_INCLUDE}"
- if test "xlibxslt/xsltInternals.h" = "x" ; then # no header, assume found
- LIBXSLT_CLEANUP_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LIBXSLT_CLEANUP_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libxslt/xsltInternals.h" "ac_cv_header_libxslt_xsltInternals_h" "$ac_includes_default"
@@ -14968,14 +14844,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${LIBXSLT_CLEANUP_HEADER_FOUND}" = "x0" ; then
LIBXSLT_CLEANUP_LIB=""
LIBXSLT_CLEANUP_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- LIBXSLT_CLEANUP_LIB=""
- fi
+
PBX_LIBXSLT_CLEANUP=1
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXSLT_CLEANUP 1
@@ -18206,8 +18080,6 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
ax_cv_have_func_attribute_pure=0
-if test "x" = "x"
-then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
void __attribute__((pure)) *test(void *muffin, ...) {return (void *) 0;}
@@ -18235,10 +18107,22 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
+
+
+CFLAGS="$saved_CFLAGS"
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute malloc' support" >&5
+$as_echo_n "checking for compiler 'attribute malloc' support... " >&6; }
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
+
+ax_cv_have_func_attribute_malloc=0
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- void __attribute__(()) *test(void *muffin, ...) ;
+ void __attribute__((malloc)) *test(void *muffin, ...) {return (void *) 0;}
int
main ()
{
@@ -18251,10 +18135,10 @@ if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- ax_cv_have_func_attribute_pure=1
+ ax_cv_have_func_attribute_malloc=1
cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_pure 1
+#define HAVE_ATTRIBUTE_malloc 1
_ACEOF
else
@@ -18263,25 +18147,22 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
CFLAGS="$saved_CFLAGS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute malloc' support" >&5
-$as_echo_n "checking for compiler 'attribute malloc' support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute const' support" >&5
+$as_echo_n "checking for compiler 'attribute const' support... " >&6; }
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
-ax_cv_have_func_attribute_malloc=0
+ax_cv_have_func_attribute_const=0
-if test "x" = "x"
-then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- void __attribute__((malloc)) *test(void *muffin, ...) {return (void *) 0;}
+ void __attribute__((const)) *test(void *muffin, ...) {return (void *) 0;}
int
main ()
{
@@ -18294,10 +18175,10 @@ if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- ax_cv_have_func_attribute_malloc=1
+ ax_cv_have_func_attribute_const=1
cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_malloc 1
+#define HAVE_ATTRIBUTE_const 1
_ACEOF
else
@@ -18306,10 +18187,22 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
+
+
+CFLAGS="$saved_CFLAGS"
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute unused' support" >&5
+$as_echo_n "checking for compiler 'attribute unused' support... " >&6; }
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
+
+ax_cv_have_func_attribute_unused=0
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- void __attribute__(()) *test(void *muffin, ...) ;
+ void __attribute__((unused)) *test(void *muffin, ...) {return (void *) 0;}
int
main ()
{
@@ -18322,10 +18215,10 @@ if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- ax_cv_have_func_attribute_malloc=1
+ ax_cv_have_func_attribute_unused=1
cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_malloc 1
+#define HAVE_ATTRIBUTE_unused 1
_ACEOF
else
@@ -18334,25 +18227,22 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
CFLAGS="$saved_CFLAGS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute const' support" >&5
-$as_echo_n "checking for compiler 'attribute const' support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute always_inline' support" >&5
+$as_echo_n "checking for compiler 'attribute always_inline' support... " >&6; }
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
-ax_cv_have_func_attribute_const=0
+ax_cv_have_func_attribute_always_inline=0
-if test "x" = "x"
-then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- void __attribute__((const)) *test(void *muffin, ...) {return (void *) 0;}
+ void __attribute__((always_inline)) *test(void *muffin, ...) {return (void *) 0;}
int
main ()
{
@@ -18365,10 +18255,10 @@ if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- ax_cv_have_func_attribute_const=1
+ ax_cv_have_func_attribute_always_inline=1
cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_const 1
+#define HAVE_ATTRIBUTE_always_inline 1
_ACEOF
else
@@ -18377,10 +18267,22 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
+
+
+CFLAGS="$saved_CFLAGS"
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute deprecated' support" >&5
+$as_echo_n "checking for compiler 'attribute deprecated' support... " >&6; }
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
+
+ax_cv_have_func_attribute_deprecated=0
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- void __attribute__(()) *test(void *muffin, ...) ;
+ void __attribute__((deprecated)) *test(void *muffin, ...) {return (void *) 0;}
int
main ()
{
@@ -18393,10 +18295,10 @@ if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- ax_cv_have_func_attribute_const=1
+ ax_cv_have_func_attribute_deprecated=1
cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_const 1
+#define HAVE_ATTRIBUTE_deprecated 1
_ACEOF
else
@@ -18405,25 +18307,22 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
CFLAGS="$saved_CFLAGS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute unused' support" >&5
-$as_echo_n "checking for compiler 'attribute unused' support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute sentinel' support" >&5
+$as_echo_n "checking for compiler 'attribute sentinel' support... " >&6; }
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
-ax_cv_have_func_attribute_unused=0
+ax_cv_have_func_attribute_sentinel=0
-if test "x" = "x"
-then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- void __attribute__((unused)) *test(void *muffin, ...) {return (void *) 0;}
+ void __attribute__((sentinel)) *test(void *muffin, ...) {return (void *) 0;}
int
main ()
{
@@ -18436,10 +18335,10 @@ if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- ax_cv_have_func_attribute_unused=1
+ ax_cv_have_func_attribute_sentinel=1
cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_unused 1
+#define HAVE_ATTRIBUTE_sentinel 1
_ACEOF
else
@@ -18448,10 +18347,22 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
+
+
+CFLAGS="$saved_CFLAGS"
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute warn_unused_result' support" >&5
+$as_echo_n "checking for compiler 'attribute warn_unused_result' support... " >&6; }
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
+
+ax_cv_have_func_attribute_warn_unused_result=0
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- void __attribute__(()) *test(void *muffin, ...) ;
+ void __attribute__((warn_unused_result)) *test(void *muffin, ...) {return (void *) 0;}
int
main ()
{
@@ -18464,365 +18375,10 @@ if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- ax_cv_have_func_attribute_unused=1
+ ax_cv_have_func_attribute_warn_unused_result=1
cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_unused 1
-_ACEOF
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-CFLAGS="$saved_CFLAGS"
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute always_inline' support" >&5
-$as_echo_n "checking for compiler 'attribute always_inline' support... " >&6; }
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
-
-ax_cv_have_func_attribute_always_inline=0
-
-if test "x" = "x"
-then
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
- void __attribute__((always_inline)) *test(void *muffin, ...) {return (void *) 0;}
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
- ax_cv_have_func_attribute_always_inline=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_always_inline 1
-_ACEOF
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
- void __attribute__(()) *test(void *muffin, ...) ;
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
- ax_cv_have_func_attribute_always_inline=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_always_inline 1
-_ACEOF
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-CFLAGS="$saved_CFLAGS"
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute deprecated' support" >&5
-$as_echo_n "checking for compiler 'attribute deprecated' support... " >&6; }
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
-
-ax_cv_have_func_attribute_deprecated=0
-
-if test "x" = "x"
-then
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
- void __attribute__((deprecated)) *test(void *muffin, ...) {return (void *) 0;}
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
- ax_cv_have_func_attribute_deprecated=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_deprecated 1
-_ACEOF
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
- void __attribute__(()) *test(void *muffin, ...) ;
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
- ax_cv_have_func_attribute_deprecated=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_deprecated 1
-_ACEOF
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-CFLAGS="$saved_CFLAGS"
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute sentinel' support" >&5
-$as_echo_n "checking for compiler 'attribute sentinel' support... " >&6; }
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
-
-ax_cv_have_func_attribute_sentinel=0
-
-if test "x" = "x"
-then
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
- void __attribute__((sentinel)) *test(void *muffin, ...) {return (void *) 0;}
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
- ax_cv_have_func_attribute_sentinel=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_sentinel 1
-_ACEOF
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
- void __attribute__(()) *test(void *muffin, ...) ;
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
- ax_cv_have_func_attribute_sentinel=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_sentinel 1
-_ACEOF
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-CFLAGS="$saved_CFLAGS"
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute warn_unused_result' support" >&5
-$as_echo_n "checking for compiler 'attribute warn_unused_result' support... " >&6; }
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
-
-ax_cv_have_func_attribute_warn_unused_result=0
-
-if test "x" = "x"
-then
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
- void __attribute__((warn_unused_result)) *test(void *muffin, ...) {return (void *) 0;}
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
- ax_cv_have_func_attribute_warn_unused_result=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_warn_unused_result 1
-_ACEOF
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
- void __attribute__(()) *test(void *muffin, ...) ;
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
- ax_cv_have_func_attribute_warn_unused_result=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_warn_unused_result 1
-_ACEOF
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-CFLAGS="$saved_CFLAGS"
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute may_alias' support" >&5
-$as_echo_n "checking for compiler 'attribute may_alias' support... " >&6; }
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
-
-ax_cv_have_func_attribute_may_alias=0
-
-if test "x" = "x"
-then
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
- void __attribute__((may_alias)) *test(void *muffin, ...) {return (void *) 0;}
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
- ax_cv_have_func_attribute_may_alias=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_may_alias 1
-_ACEOF
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
- void __attribute__(()) *test(void *muffin, ...) ;
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
- ax_cv_have_func_attribute_may_alias=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_may_alias 1
+#define HAVE_ATTRIBUTE_warn_unused_result 1
_ACEOF
else
@@ -18831,25 +18387,22 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
CFLAGS="$saved_CFLAGS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute constructor' support" >&5
-$as_echo_n "checking for compiler 'attribute constructor' support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute may_alias' support" >&5
+$as_echo_n "checking for compiler 'attribute may_alias' support... " >&6; }
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
-ax_cv_have_func_attribute_constructor=0
+ax_cv_have_func_attribute_may_alias=0
-if test "x" = "x"
-then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- void __attribute__((constructor)) *test(void *muffin, ...) {return (void *) 0;}
+ void __attribute__((may_alias)) *test(void *muffin, ...) {return (void *) 0;}
int
main ()
{
@@ -18862,10 +18415,10 @@ if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- ax_cv_have_func_attribute_constructor=1
+ ax_cv_have_func_attribute_may_alias=1
cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_constructor 1
+#define HAVE_ATTRIBUTE_may_alias 1
_ACEOF
else
@@ -18874,10 +18427,22 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
+
+
+CFLAGS="$saved_CFLAGS"
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute constructor' support" >&5
+$as_echo_n "checking for compiler 'attribute constructor' support... " >&6; }
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
+
+ax_cv_have_func_attribute_constructor=0
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- void __attribute__(()) *test(void *muffin, ...) ;
+ void __attribute__((constructor)) *test(void *muffin, ...) {return (void *) 0;}
int
main ()
{
@@ -18902,7 +18467,6 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
CFLAGS="$saved_CFLAGS"
@@ -18920,8 +18484,6 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
ax_cv_have_func_attribute_destructor=0
-if test "x" = "x"
-then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
void __attribute__((destructor)) *test(void *muffin, ...) {return (void *) 0;}
@@ -18949,35 +18511,6 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
- void __attribute__(()) *test(void *muffin, ...) ;
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
- ax_cv_have_func_attribute_destructor=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_destructor 1
-_ACEOF
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
CFLAGS="$saved_CFLAGS"
@@ -18994,36 +18527,6 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
ax_cv_have_func_attribute_noreturn=0
-if test "xnoreturn" = "x"
-then
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
- void __attribute__((noreturn)) *test(void *muffin, ...) {return (void *) 0;}
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
- ax_cv_have_func_attribute_noreturn=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_noreturn 1
-_ACEOF
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
void __attribute__((noreturn)) *test(void *muffin, ...) ;
@@ -19051,7 +18554,6 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
CFLAGS="$saved_CFLAGS"
@@ -20261,16 +19763,12 @@ if test "x${PBX_ALSA}" != "x1" -a "${USE_ALSA}" != "no"; then
pbxlibdir="-L${ALSA_DIR}"
fi
fi
- pbxfuncname="snd_spcm_init"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_ALSA_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_asound_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lasound" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lasound... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_spcm_init in -lasound" >&5
+$as_echo_n "checking for snd_spcm_init in -lasound... " >&6; }
+if ${ac_cv_lib_asound_snd_spcm_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -20284,35 +19782,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char snd_spcm_init ();
int
main ()
{
-return ${pbxfuncname} ();
+return snd_spcm_init ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_asound_snd_spcm_init=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_asound_snd_spcm_init=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_spcm_init" >&5
+$as_echo "$ac_cv_lib_asound_snd_spcm_init" >&6; }
+if test "x$ac_cv_lib_asound_snd_spcm_init" = xyes; then :
AST_ALSA_FOUND=yes
else
AST_ALSA_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_ALSA_FOUND}" = "yes"; then
@@ -20322,9 +19819,8 @@ fi
ALSA_INCLUDE="-I${ALSA_DIR}/include"
fi
ALSA_INCLUDE="${ALSA_INCLUDE} "
- if test "xalsa/asoundlib.h" = "x" ; then # no header, assume found
- ALSA_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${ALSA_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default"
@@ -20336,14 +19832,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${ALSA_HEADER_FOUND}" = "x0" ; then
ALSA_LIB=""
ALSA_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- ALSA_LIB=""
- fi
+
PBX_ALSA=1
cat >>confdefs.h <<_ACEOF
#define HAVE_ALSA 1
@@ -20366,16 +19860,12 @@ if test "x${PBX_BFD}" != "x1" -a "${USE_BFD}" != "no"; then
pbxlibdir="-L${BFD_DIR}"
fi
fi
- pbxfuncname="bfd_openr"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_BFD_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_bfd_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lbfd" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lbfd... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
+$as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
+if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -20389,35 +19879,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char bfd_openr ();
int
main ()
{
-return ${pbxfuncname} ();
+return bfd_openr ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_bfd_bfd_openr=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_bfd_bfd_openr=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
+$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
+if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
AST_BFD_FOUND=yes
else
AST_BFD_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_BFD_FOUND}" = "yes"; then
@@ -20427,9 +19916,8 @@ fi
BFD_INCLUDE="-I${BFD_DIR}/include"
fi
BFD_INCLUDE="${BFD_INCLUDE} "
- if test "xbfd.h" = "x" ; then # no header, assume found
- BFD_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${BFD_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default"
@@ -20441,14 +19929,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${BFD_HEADER_FOUND}" = "x0" ; then
BFD_LIB=""
BFD_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- BFD_LIB=""
- fi
+
PBX_BFD=1
cat >>confdefs.h <<_ACEOF
#define HAVE_BFD 1
@@ -20473,16 +19959,12 @@ if test "x${PBX_BFD}" != "x1" -a "${USE_BFD}" != "no"; then
pbxlibdir="-L${BFD_DIR}"
fi
fi
- pbxfuncname="bfd_check_format"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_BFD_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_bfd_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lbfd" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lbfd... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_check_format in -lbfd" >&5
+$as_echo_n "checking for bfd_check_format in -lbfd... " >&6; }
+if ${ac_cv_lib_bfd_bfd_check_format+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -20496,35 +19978,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char bfd_check_format ();
int
main ()
{
-return ${pbxfuncname} ();
+return bfd_check_format ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_bfd_bfd_check_format=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_bfd_bfd_check_format=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_check_format" >&5
+$as_echo "$ac_cv_lib_bfd_bfd_check_format" >&6; }
+if test "x$ac_cv_lib_bfd_bfd_check_format" = xyes; then :
AST_BFD_FOUND=yes
else
AST_BFD_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_BFD_FOUND}" = "yes"; then
@@ -20534,9 +20015,8 @@ fi
BFD_INCLUDE="-I${BFD_DIR}/include"
fi
BFD_INCLUDE="${BFD_INCLUDE} "
- if test "xbfd.h" = "x" ; then # no header, assume found
- BFD_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${BFD_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default"
@@ -20548,14 +20028,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${BFD_HEADER_FOUND}" = "x0" ; then
BFD_LIB=""
BFD_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- BFD_LIB=""
- fi
+
PBX_BFD=1
cat >>confdefs.h <<_ACEOF
#define HAVE_BFD 1
@@ -20581,16 +20059,12 @@ if test "x${PBX_BFD}" != "x1" -a "${USE_BFD}" != "no"; then
pbxlibdir="-L${BFD_DIR}"
fi
fi
- pbxfuncname="bfd_check_format"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_BFD_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_bfd_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lbfd" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lbfd... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_check_format in -lbfd" >&5
+$as_echo_n "checking for bfd_check_format in -lbfd... " >&6; }
+if ${ac_cv_lib_bfd_bfd_check_format+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -20604,35 +20078,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char bfd_check_format ();
int
main ()
{
-return ${pbxfuncname} ();
+return bfd_check_format ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_bfd_bfd_check_format=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_bfd_bfd_check_format=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_check_format" >&5
+$as_echo "$ac_cv_lib_bfd_bfd_check_format" >&6; }
+if test "x$ac_cv_lib_bfd_bfd_check_format" = xyes; then :
AST_BFD_FOUND=yes
else
AST_BFD_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_BFD_FOUND}" = "yes"; then
@@ -20642,9 +20115,8 @@ fi
BFD_INCLUDE="-I${BFD_DIR}/include"
fi
BFD_INCLUDE="${BFD_INCLUDE} "
- if test "xbfd.h" = "x" ; then # no header, assume found
- BFD_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${BFD_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default"
@@ -20656,14 +20128,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${BFD_HEADER_FOUND}" = "x0" ; then
BFD_LIB=""
BFD_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- BFD_LIB=""
- fi
+
PBX_BFD=1
cat >>confdefs.h <<_ACEOF
#define HAVE_BFD 1
@@ -20689,16 +20159,12 @@ if test "x${PBX_CAP}" != "x1" -a "${USE_CAP}" != "no"; then
pbxlibdir="-L${CAP_DIR}"
fi
fi
- pbxfuncname="cap_from_text"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_CAP_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_cap_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcap" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lcap... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_from_text in -lcap" >&5
+$as_echo_n "checking for cap_from_text in -lcap... " >&6; }
+if ${ac_cv_lib_cap_cap_from_text+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -20712,35 +20178,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char cap_from_text ();
int
main ()
{
-return ${pbxfuncname} ();
+return cap_from_text ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_cap_cap_from_text=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_cap_cap_from_text=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_cap_from_text" >&5
+$as_echo "$ac_cv_lib_cap_cap_from_text" >&6; }
+if test "x$ac_cv_lib_cap_cap_from_text" = xyes; then :
AST_CAP_FOUND=yes
else
AST_CAP_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_CAP_FOUND}" = "yes"; then
@@ -20750,9 +20215,8 @@ fi
CAP_INCLUDE="-I${CAP_DIR}/include"
fi
CAP_INCLUDE="${CAP_INCLUDE} "
- if test "xsys/capability.h" = "x" ; then # no header, assume found
- CAP_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${CAP_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default"
@@ -20764,14 +20228,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${CAP_HEADER_FOUND}" = "x0" ; then
CAP_LIB=""
CAP_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- CAP_LIB=""
- fi
+
PBX_CAP=1
cat >>confdefs.h <<_ACEOF
#define HAVE_CAP 1
@@ -20979,13 +20441,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "x${PBX_DAHDI_LINEREVERSE_VMWI}" != "x1" -a "${USE_DAHDI_LINEREVERSE_VMWI}" != "no"; then
- if test "xenhanced dahdi vmwi support" != "x"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enhanced dahdi vmwi support" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enhanced dahdi vmwi support" >&5
$as_echo_n "checking for enhanced dahdi vmwi support... " >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"struct dahdi_vmwi_info booger\" compiles using dahdi/user.h" >&5
-$as_echo_n "checking if \"struct dahdi_vmwi_info booger\" compiles using dahdi/user.h... " >&6; }
- fi
saved_cppflags="${CPPFLAGS}"
if test "x${DAHDI_LINEREVERSE_VMWI_DIR}" != "x"; then
DAHDI_LINEREVERSE_VMWI_INCLUDE="-I${DAHDI_LINEREVERSE_VMWI_DIR}/include"
@@ -21025,13 +20482,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "x${PBX_DAHDI_ECHOCANCEL_FAX_MODE}" != "x1" -a "${USE_DAHDI_ECHOCANCEL_FAX_MODE}" != "no"; then
- if test "x" != "x"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for " >&5
-$as_echo_n "checking for ... " >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"int foo = DAHDI_ECHOCANCEL_FAX_MODE\" compiles using dahdi/user.h" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"int foo = DAHDI_ECHOCANCEL_FAX_MODE\" compiles using dahdi/user.h" >&5
$as_echo_n "checking if \"int foo = DAHDI_ECHOCANCEL_FAX_MODE\" compiles using dahdi/user.h... " >&6; }
- fi
saved_cppflags="${CPPFLAGS}"
if test "x${DAHDI_ECHOCANCEL_FAX_MODE_DIR}" != "x"; then
DAHDI_ECHOCANCEL_FAX_MODE_INCLUDE="-I${DAHDI_ECHOCANCEL_FAX_MODE_DIR}/include"
@@ -21071,13 +20523,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "x${PBX_GETIFADDRS}" != "x1" -a "${USE_GETIFADDRS}" != "no"; then
- if test "xgetifaddrs() support" != "x"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs() support" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs() support" >&5
$as_echo_n "checking for getifaddrs() support... " >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"struct ifaddrs *p; getifaddrs(&p)\" compiles using ifaddrs.h" >&5
-$as_echo_n "checking if \"struct ifaddrs *p; getifaddrs(&p)\" compiles using ifaddrs.h... " >&6; }
- fi
saved_cppflags="${CPPFLAGS}"
if test "x${GETIFADDRS_DIR}" != "x"; then
GETIFADDRS_INCLUDE="-I${GETIFADDRS_DIR}/include"
@@ -21116,13 +20563,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "x${PBX_TIMERFD}" != "x1" -a "${USE_TIMERFD}" != "no"; then
- if test "xtimerfd support" != "x"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timerfd support" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timerfd support" >&5
$as_echo_n "checking for timerfd support... " >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"timerfd_create(0,0); timerfd_settime(0,0,NULL,NULL);\" compiles using sys/timerfd.h" >&5
-$as_echo_n "checking if \"timerfd_create(0,0); timerfd_settime(0,0,NULL,NULL);\" compiles using sys/timerfd.h... " >&6; }
- fi
saved_cppflags="${CPPFLAGS}"
if test "x${TIMERFD_DIR}" != "x"; then
TIMERFD_INCLUDE="-I${TIMERFD_DIR}/include"
@@ -21529,13 +20971,8 @@ fi
else
if test "x${PBX_LIBEDIT_IS_UNICODE}" != "x1" -a "${USE_LIBEDIT_IS_UNICODE}" != "no"; then
- if test "xTesting for libedit unicode support" != "x"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Testing for libedit unicode support" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Testing for libedit unicode support" >&5
$as_echo_n "checking for Testing for libedit unicode support... " >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"el_rfunc_t *callback;\" compiles using histedit.h" >&5
-$as_echo_n "checking if \"el_rfunc_t *callback;\" compiles using histedit.h... " >&6; }
- fi
saved_cppflags="${CPPFLAGS}"
if test "x${LIBEDIT_IS_UNICODE_DIR}" != "x"; then
LIBEDIT_IS_UNICODE_INCLUDE="-I${LIBEDIT_IS_UNICODE_DIR}/include"
@@ -21586,16 +21023,12 @@ if test "x${PBX_ICONV}" != "x1" -a "${USE_ICONV}" != "no"; then
pbxlibdir="-L${ICONV_DIR}"
fi
fi
- pbxfuncname="iconv_open"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_ICONV_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_iconv_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -liconv" >&5
-$as_echo_n "checking for ${pbxfuncname} in -liconv... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5
+$as_echo_n "checking for iconv_open in -liconv... " >&6; }
+if ${ac_cv_lib_iconv_iconv_open+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -21609,35 +21042,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char iconv_open ();
int
main ()
{
-return ${pbxfuncname} ();
+return iconv_open ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_iconv_iconv_open=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_iconv_iconv_open=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv_open" >&5
+$as_echo "$ac_cv_lib_iconv_iconv_open" >&6; }
+if test "x$ac_cv_lib_iconv_iconv_open" = xyes; then :
AST_ICONV_FOUND=yes
else
AST_ICONV_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_ICONV_FOUND}" = "yes"; then
@@ -21647,9 +21079,8 @@ fi
ICONV_INCLUDE="-I${ICONV_DIR}/include"
fi
ICONV_INCLUDE="${ICONV_INCLUDE} "
- if test "xiconv.h" = "x" ; then # no header, assume found
- ICONV_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${ICONV_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
@@ -21661,14 +21092,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${ICONV_HEADER_FOUND}" = "x0" ; then
ICONV_LIB=""
ICONV_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- ICONV_LIB=""
- fi
+
PBX_ICONV=1
cat >>confdefs.h <<_ACEOF
#define HAVE_ICONV 1
@@ -21691,16 +21120,12 @@ if test "x${PBX_ICONV}" != "x1" -a "${USE_ICONV}" != "no"; then
pbxlibdir="-L${ICONV_DIR}"
fi
fi
- pbxfuncname="libiconv_open"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_ICONV_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_iconv_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -liconv" >&5
-$as_echo_n "checking for ${pbxfuncname} in -liconv... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5
+$as_echo_n "checking for libiconv_open in -liconv... " >&6; }
+if ${ac_cv_lib_iconv_libiconv_open+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -21714,35 +21139,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char libiconv_open ();
int
main ()
{
-return ${pbxfuncname} ();
+return libiconv_open ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_iconv_libiconv_open=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_iconv_libiconv_open=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv_open" >&5
+$as_echo "$ac_cv_lib_iconv_libiconv_open" >&6; }
+if test "x$ac_cv_lib_iconv_libiconv_open" = xyes; then :
AST_ICONV_FOUND=yes
else
AST_ICONV_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_ICONV_FOUND}" = "yes"; then
@@ -21752,9 +21176,8 @@ fi
ICONV_INCLUDE="-I${ICONV_DIR}/include"
fi
ICONV_INCLUDE="${ICONV_INCLUDE} "
- if test "xiconv.h" = "x" ; then # no header, assume found
- ICONV_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${ICONV_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
@@ -21766,14 +21189,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${ICONV_HEADER_FOUND}" = "x0" ; then
ICONV_LIB=""
ICONV_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- ICONV_LIB=""
- fi
+
PBX_ICONV=1
cat >>confdefs.h <<_ACEOF
#define HAVE_ICONV 1
@@ -21796,16 +21217,12 @@ if test "x${PBX_ICONV}" != "x1" -a "${USE_ICONV}" != "no"; then
pbxlibdir="-L${ICONV_DIR}"
fi
fi
- pbxfuncname="iconv_close"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_ICONV_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_c_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lc" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lc... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_close in -lc" >&5
+$as_echo_n "checking for iconv_close in -lc... " >&6; }
+if ${ac_cv_lib_c_iconv_close+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -21819,35 +21236,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char iconv_close ();
int
main ()
{
-return ${pbxfuncname} ();
+return iconv_close ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_c_iconv_close=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_c_iconv_close=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_iconv_close" >&5
+$as_echo "$ac_cv_lib_c_iconv_close" >&6; }
+if test "x$ac_cv_lib_c_iconv_close" = xyes; then :
AST_ICONV_FOUND=yes
else
AST_ICONV_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_ICONV_FOUND}" = "yes"; then
@@ -21857,9 +21273,8 @@ fi
ICONV_INCLUDE="-I${ICONV_DIR}/include"
fi
ICONV_INCLUDE="${ICONV_INCLUDE} "
- if test "xiconv.h" = "x" ; then # no header, assume found
- ICONV_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${ICONV_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
@@ -21871,14 +21286,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${ICONV_HEADER_FOUND}" = "x0" ; then
ICONV_LIB=""
ICONV_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- ICONV_LIB=""
- fi
+
PBX_ICONV=1
cat >>confdefs.h <<_ACEOF
#define HAVE_ICONV 1
@@ -21902,16 +21315,12 @@ if test "x${PBX_ICAL}" != "x1" -a "${USE_ICAL}" != "no"; then
pbxlibdir="-L${ICAL_DIR}"
fi
fi
- pbxfuncname="icaltimezone_get_utc_timezone"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_ICAL_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
- as_ac_Lib=`$as_echo "ac_cv_lib_ical_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lical" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lical... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for icaltimezone_get_utc_timezone in -lical" >&5
+$as_echo_n "checking for icaltimezone_get_utc_timezone in -lical... " >&6; }
+if ${ac_cv_lib_ical_icaltimezone_get_utc_timezone+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -21925,35 +21334,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char icaltimezone_get_utc_timezone ();
int
main ()
{
-return ${pbxfuncname} ();
+return icaltimezone_get_utc_timezone ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_ical_icaltimezone_get_utc_timezone=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_ical_icaltimezone_get_utc_timezone=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ical_icaltimezone_get_utc_timezone" >&5
+$as_echo "$ac_cv_lib_ical_icaltimezone_get_utc_timezone" >&6; }
+if test "x$ac_cv_lib_ical_icaltimezone_get_utc_timezone" = xyes; then :
AST_ICAL_FOUND=yes
else
AST_ICAL_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_ICAL_FOUND}" = "yes"; then
@@ -21963,9 +21371,8 @@ fi
ICAL_INCLUDE="-I${ICAL_DIR}/include"
fi
ICAL_INCLUDE="${ICAL_INCLUDE} ${PTHREAD_CFLAGS}"
- if test "xlibical/ical.h" = "x" ; then # no header, assume found
- ICAL_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${ICAL_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libical/ical.h" "ac_cv_header_libical_ical_h" "$ac_includes_default"
@@ -21977,14 +21384,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${ICAL_HEADER_FOUND}" = "x0" ; then
ICAL_LIB=""
ICAL_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- ICAL_LIB=""
- fi
+
PBX_ICAL=1
cat >>confdefs.h <<_ACEOF
#define HAVE_ICAL 1
@@ -22007,16 +21412,12 @@ if test "x${PBX_IKSEMEL}" != "x1" -a "${USE_IKSEMEL}" != "no"; then
pbxlibdir="-L${IKSEMEL_DIR}"
fi
fi
- pbxfuncname="iks_start_sasl"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_IKSEMEL_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_iksemel_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -liksemel" >&5
-$as_echo_n "checking for ${pbxfuncname} in -liksemel... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iks_start_sasl in -liksemel" >&5
+$as_echo_n "checking for iks_start_sasl in -liksemel... " >&6; }
+if ${ac_cv_lib_iksemel_iks_start_sasl+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -22030,35 +21431,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char iks_start_sasl ();
int
main ()
{
-return ${pbxfuncname} ();
+return iks_start_sasl ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_iksemel_iks_start_sasl=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_iksemel_iks_start_sasl=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iksemel_iks_start_sasl" >&5
+$as_echo "$ac_cv_lib_iksemel_iks_start_sasl" >&6; }
+if test "x$ac_cv_lib_iksemel_iks_start_sasl" = xyes; then :
AST_IKSEMEL_FOUND=yes
else
AST_IKSEMEL_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_IKSEMEL_FOUND}" = "yes"; then
@@ -22068,9 +21468,8 @@ fi
IKSEMEL_INCLUDE="-I${IKSEMEL_DIR}/include"
fi
IKSEMEL_INCLUDE="${IKSEMEL_INCLUDE} "
- if test "xiksemel.h" = "x" ; then # no header, assume found
- IKSEMEL_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${IKSEMEL_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "iksemel.h" "ac_cv_header_iksemel_h" "$ac_includes_default"
@@ -22082,14 +21481,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${IKSEMEL_HEADER_FOUND}" = "x0" ; then
IKSEMEL_LIB=""
IKSEMEL_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- IKSEMEL_LIB=""
- fi
+
PBX_IKSEMEL=1
cat >>confdefs.h <<_ACEOF
#define HAVE_IKSEMEL 1
@@ -22740,16 +22137,12 @@ if test "x${PBX_IODBC}" != "x1" -a "${USE_IODBC}" != "no"; then
pbxlibdir="-L${IODBC_DIR}"
fi
fi
- pbxfuncname="SQLConnect"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_IODBC_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
- as_ac_Lib=`$as_echo "ac_cv_lib_iodbc_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -liodbc" >&5
-$as_echo_n "checking for ${pbxfuncname} in -liodbc... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -liodbc" >&5
+$as_echo_n "checking for SQLConnect in -liodbc... " >&6; }
+if ${ac_cv_lib_iodbc_SQLConnect+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -22763,35 +22156,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char SQLConnect ();
int
main ()
{
-return ${pbxfuncname} ();
+return SQLConnect ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_iodbc_SQLConnect=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_iodbc_SQLConnect=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iodbc_SQLConnect" >&5
+$as_echo "$ac_cv_lib_iodbc_SQLConnect" >&6; }
+if test "x$ac_cv_lib_iodbc_SQLConnect" = xyes; then :
AST_IODBC_FOUND=yes
else
AST_IODBC_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_IODBC_FOUND}" = "yes"; then
@@ -22801,9 +22193,8 @@ fi
IODBC_INCLUDE="-I${IODBC_DIR}/include"
fi
IODBC_INCLUDE="${IODBC_INCLUDE} ${PTHREAD_CFLAGS}"
- if test "xsql.h" = "x" ; then # no header, assume found
- IODBC_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${IODBC_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "sql.h" "ac_cv_header_sql_h" "$ac_includes_default"
@@ -22815,14 +22206,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${IODBC_HEADER_FOUND}" = "x0" ; then
IODBC_LIB=""
IODBC_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- IODBC_LIB=""
- fi
+
PBX_IODBC=1
cat >>confdefs.h <<_ACEOF
#define HAVE_IODBC 1
@@ -22845,16 +22234,12 @@ if test "x${PBX_INOTIFY}" != "x1" -a "${USE_INOTIFY}" != "no"; then
pbxlibdir="-L${INOTIFY_DIR}"
fi
fi
- pbxfuncname="inotify_init"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_INOTIFY_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_c_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lc" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lc... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inotify_init in -lc" >&5
+$as_echo_n "checking for inotify_init in -lc... " >&6; }
+if ${ac_cv_lib_c_inotify_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -22868,35 +22253,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char inotify_init ();
int
main ()
{
-return ${pbxfuncname} ();
+return inotify_init ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_c_inotify_init=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_c_inotify_init=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_inotify_init" >&5
+$as_echo "$ac_cv_lib_c_inotify_init" >&6; }
+if test "x$ac_cv_lib_c_inotify_init" = xyes; then :
AST_INOTIFY_FOUND=yes
else
AST_INOTIFY_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_INOTIFY_FOUND}" = "yes"; then
@@ -22906,9 +22290,8 @@ fi
INOTIFY_INCLUDE="-I${INOTIFY_DIR}/include"
fi
INOTIFY_INCLUDE="${INOTIFY_INCLUDE} "
- if test "xsys/inotify.h" = "x" ; then # no header, assume found
- INOTIFY_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${INOTIFY_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
@@ -22920,14 +22303,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${INOTIFY_HEADER_FOUND}" = "x0" ; then
INOTIFY_LIB=""
INOTIFY_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- INOTIFY_LIB=""
- fi
+
PBX_INOTIFY=1
cat >>confdefs.h <<_ACEOF
#define HAVE_INOTIFY 1
@@ -22950,16 +22331,12 @@ if test "x${PBX_JACK}" != "x1" -a "${USE_JACK}" != "no"; then
pbxlibdir="-L${JACK_DIR}"
fi
fi
- pbxfuncname="jack_activate"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_JACK_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_jack_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -ljack" >&5
-$as_echo_n "checking for ${pbxfuncname} in -ljack... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jack_activate in -ljack" >&5
+$as_echo_n "checking for jack_activate in -ljack... " >&6; }
+if ${ac_cv_lib_jack_jack_activate+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -22973,35 +22350,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char jack_activate ();
int
main ()
{
-return ${pbxfuncname} ();
+return jack_activate ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_jack_jack_activate=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_jack_jack_activate=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jack_jack_activate" >&5
+$as_echo "$ac_cv_lib_jack_jack_activate" >&6; }
+if test "x$ac_cv_lib_jack_jack_activate" = xyes; then :
AST_JACK_FOUND=yes
else
AST_JACK_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_JACK_FOUND}" = "yes"; then
@@ -23011,9 +22387,8 @@ fi
JACK_INCLUDE="-I${JACK_DIR}/include"
fi
JACK_INCLUDE="${JACK_INCLUDE} "
- if test "xjack/jack.h" = "x" ; then # no header, assume found
- JACK_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${JACK_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "jack/jack.h" "ac_cv_header_jack_jack_h" "$ac_includes_default"
@@ -23025,14 +22400,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${JACK_HEADER_FOUND}" = "x0" ; then
JACK_LIB=""
JACK_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- JACK_LIB=""
- fi
+
PBX_JACK=1
cat >>confdefs.h <<_ACEOF
#define HAVE_JACK 1
@@ -23056,16 +22429,12 @@ if test "x${PBX_KQUEUE}" != "x1" -a "${USE_KQUEUE}" != "no"; then
pbxlibdir="-L${KQUEUE_DIR}"
fi
fi
- pbxfuncname="kqueue"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_KQUEUE_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_c_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lc" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lc... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kqueue in -lc" >&5
+$as_echo_n "checking for kqueue in -lc... " >&6; }
+if ${ac_cv_lib_c_kqueue+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -23079,35 +22448,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char kqueue ();
int
main ()
{
-return ${pbxfuncname} ();
+return kqueue ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_c_kqueue=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_c_kqueue=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_kqueue" >&5
+$as_echo "$ac_cv_lib_c_kqueue" >&6; }
+if test "x$ac_cv_lib_c_kqueue" = xyes; then :
AST_KQUEUE_FOUND=yes
else
AST_KQUEUE_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_KQUEUE_FOUND}" = "yes"; then
@@ -23117,9 +22485,8 @@ fi
KQUEUE_INCLUDE="-I${KQUEUE_DIR}/include"
fi
KQUEUE_INCLUDE="${KQUEUE_INCLUDE} "
- if test "xsys/event.h" = "x" ; then # no header, assume found
- KQUEUE_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${KQUEUE_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "sys/event.h" "ac_cv_header_sys_event_h" "$ac_includes_default"
@@ -23131,14 +22498,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${KQUEUE_HEADER_FOUND}" = "x0" ; then
KQUEUE_LIB=""
KQUEUE_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- KQUEUE_LIB=""
- fi
+
PBX_KQUEUE=1
cat >>confdefs.h <<_ACEOF
#define HAVE_KQUEUE 1
@@ -23175,16 +22540,12 @@ if test "x${PBX_LTDL}" != "x1" -a "${USE_LTDL}" != "no"; then
pbxlibdir="-L${LTDL_DIR}"
fi
fi
- pbxfuncname="lt_dlinit"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_LTDL_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_ltdl_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lltdl" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lltdl... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlinit in -lltdl" >&5
+$as_echo_n "checking for lt_dlinit in -lltdl... " >&6; }
+if ${ac_cv_lib_ltdl_lt_dlinit+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -23198,35 +22559,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char lt_dlinit ();
int
main ()
{
-return ${pbxfuncname} ();
+return lt_dlinit ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_ltdl_lt_dlinit=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_ltdl_lt_dlinit=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ltdl_lt_dlinit" >&5
+$as_echo "$ac_cv_lib_ltdl_lt_dlinit" >&6; }
+if test "x$ac_cv_lib_ltdl_lt_dlinit" = xyes; then :
AST_LTDL_FOUND=yes
else
AST_LTDL_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_LTDL_FOUND}" = "yes"; then
@@ -23236,9 +22596,8 @@ fi
LTDL_INCLUDE="-I${LTDL_DIR}/include"
fi
LTDL_INCLUDE="${LTDL_INCLUDE} "
- if test "xltdl.h" = "x" ; then # no header, assume found
- LTDL_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LTDL_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
@@ -23250,14 +22609,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${LTDL_HEADER_FOUND}" = "x0" ; then
LTDL_LIB=""
LTDL_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- LTDL_LIB=""
- fi
+
PBX_LTDL=1
cat >>confdefs.h <<_ACEOF
#define HAVE_LTDL 1
@@ -23280,16 +22637,12 @@ if test "x${PBX_LDAP}" != "x1" -a "${USE_LDAP}" != "no"; then
pbxlibdir="-L${LDAP_DIR}"
fi
fi
- pbxfuncname="ldap_initialize"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_LDAP_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_ldap_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lldap" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lldap... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize in -lldap" >&5
+$as_echo_n "checking for ldap_initialize in -lldap... " >&6; }
+if ${ac_cv_lib_ldap_ldap_initialize+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -23303,35 +22656,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char ldap_initialize ();
int
main ()
{
-return ${pbxfuncname} ();
+return ldap_initialize ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_ldap_ldap_initialize=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_ldap_ldap_initialize=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_initialize" >&5
+$as_echo "$ac_cv_lib_ldap_ldap_initialize" >&6; }
+if test "x$ac_cv_lib_ldap_ldap_initialize" = xyes; then :
AST_LDAP_FOUND=yes
else
AST_LDAP_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_LDAP_FOUND}" = "yes"; then
@@ -23341,9 +22693,8 @@ fi
LDAP_INCLUDE="-I${LDAP_DIR}/include"
fi
LDAP_INCLUDE="${LDAP_INCLUDE} "
- if test "xldap.h" = "x" ; then # no header, assume found
- LDAP_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LDAP_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default"
@@ -23355,14 +22706,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${LDAP_HEADER_FOUND}" = "x0" ; then
LDAP_LIB=""
LDAP_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- LDAP_LIB=""
- fi
+
PBX_LDAP=1
cat >>confdefs.h <<_ACEOF
#define HAVE_LDAP 1
@@ -23385,16 +22734,12 @@ if test "x${PBX_MISDN}" != "x1" -a "${USE_MISDN}" != "no"; then
pbxlibdir="-L${MISDN_DIR}"
fi
fi
- pbxfuncname="mISDN_open"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_MISDN_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_mISDN_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lmISDN" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lmISDN... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mISDN_open in -lmISDN" >&5
+$as_echo_n "checking for mISDN_open in -lmISDN... " >&6; }
+if ${ac_cv_lib_mISDN_mISDN_open+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -23408,35 +22753,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char mISDN_open ();
int
main ()
{
-return ${pbxfuncname} ();
+return mISDN_open ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_mISDN_mISDN_open=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_mISDN_mISDN_open=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mISDN_mISDN_open" >&5
+$as_echo "$ac_cv_lib_mISDN_mISDN_open" >&6; }
+if test "x$ac_cv_lib_mISDN_mISDN_open" = xyes; then :
AST_MISDN_FOUND=yes
else
AST_MISDN_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_MISDN_FOUND}" = "yes"; then
@@ -23446,9 +22790,8 @@ fi
MISDN_INCLUDE="-I${MISDN_DIR}/include"
fi
MISDN_INCLUDE="${MISDN_INCLUDE} "
- if test "xmISDNuser/mISDNlib.h" = "x" ; then # no header, assume found
- MISDN_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${MISDN_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "mISDNuser/mISDNlib.h" "ac_cv_header_mISDNuser_mISDNlib_h" "$ac_includes_default"
@@ -23460,14 +22803,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${MISDN_HEADER_FOUND}" = "x0" ; then
MISDN_LIB=""
MISDN_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- MISDN_LIB=""
- fi
+
PBX_MISDN=1
cat >>confdefs.h <<_ACEOF
#define HAVE_MISDN 1
@@ -23491,16 +22832,12 @@ if test "x${PBX_ISDNNET}" != "x1" -a "${USE_ISDNNET}" != "no"; then
pbxlibdir="-L${ISDNNET_DIR}"
fi
fi
- pbxfuncname="init_manager"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_ISDNNET_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_isdnnet_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lisdnnet" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lisdnnet... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for init_manager in -lisdnnet" >&5
+$as_echo_n "checking for init_manager in -lisdnnet... " >&6; }
+if ${ac_cv_lib_isdnnet_init_manager+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -23514,35 +22851,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char init_manager ();
int
main ()
{
-return ${pbxfuncname} ();
+return init_manager ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_isdnnet_init_manager=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_isdnnet_init_manager=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_isdnnet_init_manager" >&5
+$as_echo "$ac_cv_lib_isdnnet_init_manager" >&6; }
+if test "x$ac_cv_lib_isdnnet_init_manager" = xyes; then :
AST_ISDNNET_FOUND=yes
else
AST_ISDNNET_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_ISDNNET_FOUND}" = "yes"; then
@@ -23552,9 +22888,8 @@ fi
ISDNNET_INCLUDE="-I${ISDNNET_DIR}/include"
fi
ISDNNET_INCLUDE="${ISDNNET_INCLUDE} "
- if test "xmISDNuser/isdn_net.h" = "x" ; then # no header, assume found
- ISDNNET_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${ISDNNET_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "mISDNuser/isdn_net.h" "ac_cv_header_mISDNuser_isdn_net_h" "$ac_includes_default"
@@ -23566,14 +22901,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${ISDNNET_HEADER_FOUND}" = "x0" ; then
ISDNNET_LIB=""
ISDNNET_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- ISDNNET_LIB=""
- fi
+
PBX_ISDNNET=1
cat >>confdefs.h <<_ACEOF
#define HAVE_ISDNNET 1
@@ -23595,16 +22928,12 @@ if test "x${PBX_SUPPSERV}" != "x1" -a "${USE_SUPPSERV}" != "no"; then
pbxlibdir="-L${SUPPSERV_DIR}"
fi
fi
- pbxfuncname="encodeFac"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SUPPSERV_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_suppserv_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsuppserv" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lsuppserv... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for encodeFac in -lsuppserv" >&5
+$as_echo_n "checking for encodeFac in -lsuppserv... " >&6; }
+if ${ac_cv_lib_suppserv_encodeFac+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -23618,35 +22947,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char encodeFac ();
int
main ()
{
-return ${pbxfuncname} ();
+return encodeFac ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_suppserv_encodeFac=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_suppserv_encodeFac=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_suppserv_encodeFac" >&5
+$as_echo "$ac_cv_lib_suppserv_encodeFac" >&6; }
+if test "x$ac_cv_lib_suppserv_encodeFac" = xyes; then :
AST_SUPPSERV_FOUND=yes
else
AST_SUPPSERV_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SUPPSERV_FOUND}" = "yes"; then
@@ -23656,9 +22984,8 @@ fi
SUPPSERV_INCLUDE="-I${SUPPSERV_DIR}/include"
fi
SUPPSERV_INCLUDE="${SUPPSERV_INCLUDE} "
- if test "xmISDNuser/suppserv.h" = "x" ; then # no header, assume found
- SUPPSERV_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SUPPSERV_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "mISDNuser/suppserv.h" "ac_cv_header_mISDNuser_suppserv_h" "$ac_includes_default"
@@ -23670,14 +22997,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${SUPPSERV_HEADER_FOUND}" = "x0" ; then
SUPPSERV_LIB=""
SUPPSERV_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SUPPSERV_LIB=""
- fi
+
PBX_SUPPSERV=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SUPPSERV 1
@@ -23904,47 +23229,18 @@ else
fi
if test ! "x${CONFIG_MYSQLCLIENT}" = xNo; then
- if test x"" = x ; then A=--cflags ; else A="" ; fi
- MYSQLCLIENT_INCLUDE=$(${CONFIG_MYSQLCLIENT} $A)
+ MYSQLCLIENT_INCLUDE=$(${CONFIG_MYSQLCLIENT} --cflags)
MYSQLCLIENT_INCLUDE=$(echo ${MYSQLCLIENT_INCLUDE} | $SED -e "s|-I|-I${MYSQLCLIENT_DIR}|g")
- if test x"" = x ; then A=--libs ; else A="" ; fi
- MYSQLCLIENT_LIB=$(${CONFIG_MYSQLCLIENT} $A)
+ MYSQLCLIENT_LIB=$(${CONFIG_MYSQLCLIENT} --libs)
MYSQLCLIENT_LIB=$(echo ${MYSQLCLIENT_LIB} | $SED -e "s|-L|-L${MYSQLCLIENT_DIR}|g")
- if test x"" != x ; then
- saved_cppflags="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${MYSQLCLIENT_INCLUDE}"
-
- saved_libs="${LIBS}"
- LIBS=${MYSQLCLIENT_LIB}
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
- ;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- PBX_MYSQLCLIENT=1
-$as_echo "#define HAVE_MYSQLCLIENT 1" >>confdefs.h
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CPPFLAGS="${saved_cppflags}"
- LIBS="${saved_libs}"
- else
PBX_MYSQLCLIENT=1
$as_echo "#define HAVE_MYSQLCLIENT 1" >>confdefs.h
- fi
+
fi
fi
@@ -23960,16 +23256,12 @@ if test "x${PBX_NBS}" != "x1" -a "${USE_NBS}" != "no"; then
pbxlibdir="-L${NBS_DIR}"
fi
fi
- pbxfuncname="nbs_connect"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_NBS_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_nbs_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lnbs" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lnbs... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nbs_connect in -lnbs" >&5
+$as_echo_n "checking for nbs_connect in -lnbs... " >&6; }
+if ${ac_cv_lib_nbs_nbs_connect+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -23983,35 +23275,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char nbs_connect ();
int
main ()
{
-return ${pbxfuncname} ();
+return nbs_connect ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_nbs_nbs_connect=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_nbs_nbs_connect=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nbs_nbs_connect" >&5
+$as_echo "$ac_cv_lib_nbs_nbs_connect" >&6; }
+if test "x$ac_cv_lib_nbs_nbs_connect" = xyes; then :
AST_NBS_FOUND=yes
else
AST_NBS_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_NBS_FOUND}" = "yes"; then
@@ -24021,9 +23312,8 @@ fi
NBS_INCLUDE="-I${NBS_DIR}/include"
fi
NBS_INCLUDE="${NBS_INCLUDE} "
- if test "xnbs.h" = "x" ; then # no header, assume found
- NBS_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${NBS_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "nbs.h" "ac_cv_header_nbs_h" "$ac_includes_default"
@@ -24035,14 +23325,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${NBS_HEADER_FOUND}" = "x0" ; then
NBS_LIB=""
NBS_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- NBS_LIB=""
- fi
+
PBX_NBS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_NBS 1
@@ -24158,47 +23446,18 @@ else
fi
if test ! "x${CONFIG_NEON}" = xNo; then
- if test x"" = x ; then A=--cflags ; else A="" ; fi
- NEON_INCLUDE=$(${CONFIG_NEON} $A)
+ NEON_INCLUDE=$(${CONFIG_NEON} --cflags)
NEON_INCLUDE=$(echo ${NEON_INCLUDE} | $SED -e "s|-I|-I${NEON_DIR}|g")
- if test x"" = x ; then A=--libs ; else A="" ; fi
- NEON_LIB=$(${CONFIG_NEON} $A)
+ NEON_LIB=$(${CONFIG_NEON} --libs)
NEON_LIB=$(echo ${NEON_LIB} | $SED -e "s|-L|-L${NEON_DIR}|g")
- if test x"" != x ; then
- saved_cppflags="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${NEON_INCLUDE}"
-
- saved_libs="${LIBS}"
- LIBS=${NEON_LIB}
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
- ;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- PBX_NEON=1
-$as_echo "#define HAVE_NEON 1" >>confdefs.h
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CPPFLAGS="${saved_cppflags}"
- LIBS="${saved_libs}"
- else
PBX_NEON=1
$as_echo "#define HAVE_NEON 1" >>confdefs.h
- fi
+
fi
fi
@@ -24307,15 +23566,13 @@ else
fi
if test ! "x${CONFIG_NEON29}" = xNo; then
- if test x"" = x ; then A=--cflags ; else A="" ; fi
- NEON29_INCLUDE=$(${CONFIG_NEON29} $A)
+ NEON29_INCLUDE=$(${CONFIG_NEON29} --cflags)
NEON29_INCLUDE=$(echo ${NEON29_INCLUDE} | $SED -e "s|-I|-I${NEON29_DIR}|g")
- if test x"--libs" = x ; then A=--libs ; else A="--libs" ; fi
- NEON29_LIB=$(${CONFIG_NEON29} $A)
+ NEON29_LIB=$(${CONFIG_NEON29} --libs)
NEON29_LIB=$(echo ${NEON29_LIB} | $SED -e "s|-L|-L${NEON29_DIR}|g")
- if test x"#include <ne_auth.h>" != x ; then
+
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${NEON29_INCLUDE}"
@@ -24344,12 +23601,7 @@ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CPPFLAGS="${saved_cppflags}"
LIBS="${saved_libs}"
- else
- PBX_NEON29=1
-
-$as_echo "#define HAVE_NEON29 1" >>confdefs.h
- fi
fi
fi
@@ -24458,17 +23710,13 @@ else
fi
if test ! "x${CONFIG_NETSNMP}" = xNo; then
- if test x"" = x ; then A=--cflags ; else A="" ; fi
- NETSNMP_INCLUDE=$(${CONFIG_NETSNMP} $A)
+ NETSNMP_INCLUDE=$(${CONFIG_NETSNMP} --cflags)
NETSNMP_INCLUDE=$(echo ${NETSNMP_INCLUDE} | $SED -e "s|-I|-I${NETSNMP_DIR}|g")
- if test x"--agent-libs" = x ; then A=--libs ; else A="--agent-libs" ; fi
- NETSNMP_LIB=$(${CONFIG_NETSNMP} $A)
+ NETSNMP_LIB=$(${CONFIG_NETSNMP} --agent-libs)
NETSNMP_LIB=$(echo ${NETSNMP_LIB} | $SED -e "s|-L|-L${NETSNMP_DIR}|g")
- if test x"#include <net-snmp/net-snmp-config.h>
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>" != x ; then
+
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${NETSNMP_INCLUDE}"
@@ -24497,12 +23745,7 @@ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CPPFLAGS="${saved_cppflags}"
LIBS="${saved_libs}"
- else
- PBX_NETSNMP=1
-
-$as_echo "#define HAVE_NETSNMP 1" >>confdefs.h
- fi
fi
fi
@@ -24518,16 +23761,12 @@ if test "x${PBX_NEWT}" != "x1" -a "${USE_NEWT}" != "no"; then
pbxlibdir="-L${NEWT_DIR}"
fi
fi
- pbxfuncname="newtBell"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_NEWT_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_newt_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lnewt" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lnewt... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for newtBell in -lnewt" >&5
+$as_echo_n "checking for newtBell in -lnewt... " >&6; }
+if ${ac_cv_lib_newt_newtBell+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -24541,35 +23780,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char newtBell ();
int
main ()
{
-return ${pbxfuncname} ();
+return newtBell ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_newt_newtBell=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_newt_newtBell=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_newt_newtBell" >&5
+$as_echo "$ac_cv_lib_newt_newtBell" >&6; }
+if test "x$ac_cv_lib_newt_newtBell" = xyes; then :
AST_NEWT_FOUND=yes
else
AST_NEWT_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_NEWT_FOUND}" = "yes"; then
@@ -24579,9 +23817,8 @@ fi
NEWT_INCLUDE="-I${NEWT_DIR}/include"
fi
NEWT_INCLUDE="${NEWT_INCLUDE} "
- if test "xnewt.h" = "x" ; then # no header, assume found
- NEWT_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${NEWT_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "newt.h" "ac_cv_header_newt_h" "$ac_includes_default"
@@ -24593,14 +23830,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${NEWT_HEADER_FOUND}" = "x0" ; then
NEWT_LIB=""
NEWT_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- NEWT_LIB=""
- fi
+
PBX_NEWT=1
cat >>confdefs.h <<_ACEOF
#define HAVE_NEWT 1
@@ -24630,16 +23865,12 @@ if test "x${PBX_UNBOUND}" != "x1" -a "${USE_UNBOUND}" != "no"; then
pbxlibdir="-L${UNBOUND_DIR}"
fi
fi
- pbxfuncname="ub_ctx_delete"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_UNBOUND_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_unbound_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lunbound" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lunbound... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ub_ctx_delete in -lunbound" >&5
+$as_echo_n "checking for ub_ctx_delete in -lunbound... " >&6; }
+if ${ac_cv_lib_unbound_ub_ctx_delete+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -24653,35 +23884,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char ub_ctx_delete ();
int
main ()
{
-return ${pbxfuncname} ();
+return ub_ctx_delete ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_unbound_ub_ctx_delete=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_unbound_ub_ctx_delete=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_unbound_ub_ctx_delete" >&5
+$as_echo "$ac_cv_lib_unbound_ub_ctx_delete" >&6; }
+if test "x$ac_cv_lib_unbound_ub_ctx_delete" = xyes; then :
AST_UNBOUND_FOUND=yes
else
AST_UNBOUND_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_UNBOUND_FOUND}" = "yes"; then
@@ -24691,9 +23921,8 @@ fi
UNBOUND_INCLUDE="-I${UNBOUND_DIR}/include"
fi
UNBOUND_INCLUDE="${UNBOUND_INCLUDE} "
- if test "xunbound.h" = "x" ; then # no header, assume found
- UNBOUND_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${UNBOUND_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "unbound.h" "ac_cv_header_unbound_h" "$ac_includes_default"
@@ -24705,14 +23934,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${UNBOUND_HEADER_FOUND}" = "x0" ; then
UNBOUND_LIB=""
UNBOUND_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- UNBOUND_LIB=""
- fi
+
PBX_UNBOUND=1
cat >>confdefs.h <<_ACEOF
#define HAVE_UNBOUND 1
@@ -24778,16 +24005,12 @@ if test "x${PBX_UNIXODBC}" != "x1" -a "${USE_UNIXODBC}" != "no"; then
pbxlibdir="-L${UNIXODBC_DIR}"
fi
fi
- pbxfuncname="SQLConnect"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_UNIXODBC_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_odbc_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lodbc" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lodbc... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -lodbc" >&5
+$as_echo_n "checking for SQLConnect in -lodbc... " >&6; }
+if ${ac_cv_lib_odbc_SQLConnect+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -24801,35 +24024,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char SQLConnect ();
int
main ()
{
-return ${pbxfuncname} ();
+return SQLConnect ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_odbc_SQLConnect=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_odbc_SQLConnect=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_odbc_SQLConnect" >&5
+$as_echo "$ac_cv_lib_odbc_SQLConnect" >&6; }
+if test "x$ac_cv_lib_odbc_SQLConnect" = xyes; then :
AST_UNIXODBC_FOUND=yes
else
AST_UNIXODBC_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_UNIXODBC_FOUND}" = "yes"; then
@@ -24839,9 +24061,8 @@ fi
UNIXODBC_INCLUDE="-I${UNIXODBC_DIR}/include"
fi
UNIXODBC_INCLUDE="${UNIXODBC_INCLUDE} "
- if test "xsql.h" = "x" ; then # no header, assume found
- UNIXODBC_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${UNIXODBC_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "sql.h" "ac_cv_header_sql_h" "$ac_includes_default"
@@ -24853,14 +24074,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${UNIXODBC_HEADER_FOUND}" = "x0" ; then
UNIXODBC_LIB=""
UNIXODBC_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- UNIXODBC_LIB=""
- fi
+
PBX_UNIXODBC=1
cat >>confdefs.h <<_ACEOF
#define HAVE_UNIXODBC 1
@@ -24883,16 +24102,12 @@ if test "x${PBX_OGG}" != "x1" -a "${USE_OGG}" != "no"; then
pbxlibdir="-L${OGG_DIR}"
fi
fi
- pbxfuncname="ogg_sync_init"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_OGG_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_ogg_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -logg" >&5
-$as_echo_n "checking for ${pbxfuncname} in -logg... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ogg_sync_init in -logg" >&5
+$as_echo_n "checking for ogg_sync_init in -logg... " >&6; }
+if ${ac_cv_lib_ogg_ogg_sync_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -24906,35 +24121,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char ogg_sync_init ();
int
main ()
{
-return ${pbxfuncname} ();
+return ogg_sync_init ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_ogg_ogg_sync_init=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_ogg_ogg_sync_init=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ogg_ogg_sync_init" >&5
+$as_echo "$ac_cv_lib_ogg_ogg_sync_init" >&6; }
+if test "x$ac_cv_lib_ogg_ogg_sync_init" = xyes; then :
AST_OGG_FOUND=yes
else
AST_OGG_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_OGG_FOUND}" = "yes"; then
@@ -24944,28 +24158,15 @@ fi
OGG_INCLUDE="-I${OGG_DIR}/include"
fi
OGG_INCLUDE="${OGG_INCLUDE} "
- if test "x" = "x" ; then # no header, assume found
- OGG_HEADER_FOUND="1"
- else # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${OGG_INCLUDE}"
- ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default"
-if test "x$ac_cv_header_" = xyes; then :
- OGG_HEADER_FOUND=1
-else
- OGG_HEADER_FOUND=0
-fi
+ # no header, assume found
+ OGG_HEADER_FOUND="1"
- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
if test "x${OGG_HEADER_FOUND}" = "x0" ; then
OGG_LIB=""
OGG_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- OGG_LIB=""
- fi
+
PBX_OGG=1
cat >>confdefs.h <<_ACEOF
#define HAVE_OGG 1
@@ -24989,16 +24190,12 @@ if test "x${PBX_BKTR}" != "x1" -a "${USE_BKTR}" != "no"; then
pbxlibdir="-L${BKTR_DIR}"
fi
fi
- pbxfuncname="backtrace"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_BKTR_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_execinfo_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lexecinfo" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lexecinfo... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace in -lexecinfo" >&5
+$as_echo_n "checking for backtrace in -lexecinfo... " >&6; }
+if ${ac_cv_lib_execinfo_backtrace+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -25012,35 +24209,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char backtrace ();
int
main ()
{
-return ${pbxfuncname} ();
+return backtrace ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_execinfo_backtrace=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_execinfo_backtrace=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_execinfo_backtrace" >&5
+$as_echo "$ac_cv_lib_execinfo_backtrace" >&6; }
+if test "x$ac_cv_lib_execinfo_backtrace" = xyes; then :
AST_BKTR_FOUND=yes
else
AST_BKTR_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_BKTR_FOUND}" = "yes"; then
@@ -25050,9 +24246,8 @@ fi
BKTR_INCLUDE="-I${BKTR_DIR}/include"
fi
BKTR_INCLUDE="${BKTR_INCLUDE} "
- if test "xexecinfo.h" = "x" ; then # no header, assume found
- BKTR_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${BKTR_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
@@ -25064,14 +24259,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${BKTR_HEADER_FOUND}" = "x0" ; then
BKTR_LIB=""
BKTR_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- BKTR_LIB=""
- fi
+
PBX_BKTR=1
cat >>confdefs.h <<_ACEOF
#define HAVE_BKTR 1
@@ -25094,16 +24287,12 @@ if test "x${PBX_BKTR}" != "x1" -a "${USE_BKTR}" != "no"; then
pbxlibdir="-L${BKTR_DIR}"
fi
fi
- pbxfuncname="backtrace"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_BKTR_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_c_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lc" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lc... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace in -lc" >&5
+$as_echo_n "checking for backtrace in -lc... " >&6; }
+if ${ac_cv_lib_c_backtrace+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -25117,35 +24306,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char backtrace ();
int
main ()
{
-return ${pbxfuncname} ();
+return backtrace ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_c_backtrace=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_c_backtrace=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_backtrace" >&5
+$as_echo "$ac_cv_lib_c_backtrace" >&6; }
+if test "x$ac_cv_lib_c_backtrace" = xyes; then :
AST_BKTR_FOUND=yes
else
AST_BKTR_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_BKTR_FOUND}" = "yes"; then
@@ -25155,9 +24343,8 @@ fi
BKTR_INCLUDE="-I${BKTR_DIR}/include"
fi
BKTR_INCLUDE="${BKTR_INCLUDE} "
- if test "xexecinfo.h" = "x" ; then # no header, assume found
- BKTR_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${BKTR_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
@@ -25169,14 +24356,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${BKTR_HEADER_FOUND}" = "x0" ; then
BKTR_LIB=""
BKTR_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- BKTR_LIB=""
- fi
+
PBX_BKTR=1
cat >>confdefs.h <<_ACEOF
#define HAVE_BKTR 1
@@ -25199,16 +24384,12 @@ if test "x${PBX_BLUETOOTH}" != "x1" -a "${USE_BLUETOOTH}" != "no"; then
pbxlibdir="-L${BLUETOOTH_DIR}"
fi
fi
- pbxfuncname="ba2str"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_BLUETOOTH_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_bluetooth_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lbluetooth" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lbluetooth... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ba2str in -lbluetooth" >&5
+$as_echo_n "checking for ba2str in -lbluetooth... " >&6; }
+if ${ac_cv_lib_bluetooth_ba2str+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -25222,35 +24403,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char ba2str ();
int
main ()
{
-return ${pbxfuncname} ();
+return ba2str ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_bluetooth_ba2str=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_bluetooth_ba2str=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bluetooth_ba2str" >&5
+$as_echo "$ac_cv_lib_bluetooth_ba2str" >&6; }
+if test "x$ac_cv_lib_bluetooth_ba2str" = xyes; then :
AST_BLUETOOTH_FOUND=yes
else
AST_BLUETOOTH_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_BLUETOOTH_FOUND}" = "yes"; then
@@ -25260,9 +24440,8 @@ fi
BLUETOOTH_INCLUDE="-I${BLUETOOTH_DIR}/include"
fi
BLUETOOTH_INCLUDE="${BLUETOOTH_INCLUDE} "
- if test "xbluetooth/bluetooth.h" = "x" ; then # no header, assume found
- BLUETOOTH_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${BLUETOOTH_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "bluetooth/bluetooth.h" "ac_cv_header_bluetooth_bluetooth_h" "$ac_includes_default"
@@ -25274,14 +24453,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${BLUETOOTH_HEADER_FOUND}" = "x0" ; then
BLUETOOTH_LIB=""
BLUETOOTH_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- BLUETOOTH_LIB=""
- fi
+
PBX_BLUETOOTH=1
cat >>confdefs.h <<_ACEOF
#define HAVE_BLUETOOTH 1
@@ -25304,16 +24481,12 @@ if test "x${PBX_BEANSTALK}" != "x1" -a "${USE_BEANSTALK}" != "no"; then
pbxlibdir="-L${BEANSTALK_DIR}"
fi
fi
- pbxfuncname="bs_version"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_BEANSTALK_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_beanstalk_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lbeanstalk" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lbeanstalk... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bs_version in -lbeanstalk" >&5
+$as_echo_n "checking for bs_version in -lbeanstalk... " >&6; }
+if ${ac_cv_lib_beanstalk_bs_version+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -25327,35 +24500,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char bs_version ();
int
main ()
{
-return ${pbxfuncname} ();
+return bs_version ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_beanstalk_bs_version=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_beanstalk_bs_version=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_beanstalk_bs_version" >&5
+$as_echo "$ac_cv_lib_beanstalk_bs_version" >&6; }
+if test "x$ac_cv_lib_beanstalk_bs_version" = xyes; then :
AST_BEANSTALK_FOUND=yes
else
AST_BEANSTALK_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_BEANSTALK_FOUND}" = "yes"; then
@@ -25365,9 +24537,8 @@ fi
BEANSTALK_INCLUDE="-I${BEANSTALK_DIR}/include"
fi
BEANSTALK_INCLUDE="${BEANSTALK_INCLUDE} "
- if test "xbeanstalk.h" = "x" ; then # no header, assume found
- BEANSTALK_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${BEANSTALK_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "beanstalk.h" "ac_cv_header_beanstalk_h" "$ac_includes_default"
@@ -25379,14 +24550,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${BEANSTALK_HEADER_FOUND}" = "x0" ; then
BEANSTALK_LIB=""
BEANSTALK_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- BEANSTALK_LIB=""
- fi
+
PBX_BEANSTALK=1
cat >>confdefs.h <<_ACEOF
#define HAVE_BEANSTALK 1
@@ -25410,58 +24579,10 @@ if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then
pbxlibdir="-L${OSS_DIR}"
fi
fi
- pbxfuncname=""
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_OSS_FOUND=yes
- else
- ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
- CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_ossaudio_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lossaudio" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lossaudio... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lossaudio ${pbxlibdir} $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_OSS_FOUND=yes
-else
- AST_OSS_FOUND=no
-fi
- CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+ # empty lib, assume only headers
+ AST_OSS_FOUND=yes
+
# now check for the header.
if test "${AST_OSS_FOUND}" = "yes"; then
@@ -25471,9 +24592,8 @@ fi
OSS_INCLUDE="-I${OSS_DIR}/include"
fi
OSS_INCLUDE="${OSS_INCLUDE} "
- if test "xlinux/soundcard.h" = "x" ; then # no header, assume found
- OSS_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "linux/soundcard.h" "ac_cv_header_linux_soundcard_h" "$ac_includes_default"
@@ -25485,14 +24605,15 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${OSS_HEADER_FOUND}" = "x0" ; then
OSS_LIB=""
OSS_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
+
+ # only checking headers -> no library
OSS_LIB=""
- fi
+
PBX_OSS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_OSS 1
@@ -25514,58 +24635,10 @@ if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then
pbxlibdir="-L${OSS_DIR}"
fi
fi
- pbxfuncname=""
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_OSS_FOUND=yes
- else
- ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
- CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_ossaudio_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lossaudio" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lossaudio... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lossaudio ${pbxlibdir} $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_OSS_FOUND=yes
-else
- AST_OSS_FOUND=no
-fi
+ # empty lib, assume only headers
+ AST_OSS_FOUND=yes
- CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
# now check for the header.
if test "${AST_OSS_FOUND}" = "yes"; then
@@ -25575,9 +24648,8 @@ fi
OSS_INCLUDE="-I${OSS_DIR}/include"
fi
OSS_INCLUDE="${OSS_INCLUDE} "
- if test "xsys/soundcard.h" = "x" ; then # no header, assume found
- OSS_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default"
@@ -25589,14 +24661,15 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${OSS_HEADER_FOUND}" = "x0" ; then
OSS_LIB=""
OSS_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
+
+ # only checking headers -> no library
OSS_LIB=""
- fi
+
PBX_OSS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_OSS 1
@@ -25618,16 +24691,12 @@ if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then
pbxlibdir="-L${OSS_DIR}"
fi
fi
- pbxfuncname="oss_ioctl_mixer"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_OSS_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_ossaudio_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lossaudio" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lossaudio... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for oss_ioctl_mixer in -lossaudio" >&5
+$as_echo_n "checking for oss_ioctl_mixer in -lossaudio... " >&6; }
+if ${ac_cv_lib_ossaudio_oss_ioctl_mixer+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -25641,35 +24710,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char oss_ioctl_mixer ();
int
main ()
{
-return ${pbxfuncname} ();
+return oss_ioctl_mixer ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_ossaudio_oss_ioctl_mixer=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_ossaudio_oss_ioctl_mixer=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio_oss_ioctl_mixer" >&5
+$as_echo "$ac_cv_lib_ossaudio_oss_ioctl_mixer" >&6; }
+if test "x$ac_cv_lib_ossaudio_oss_ioctl_mixer" = xyes; then :
AST_OSS_FOUND=yes
else
AST_OSS_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_OSS_FOUND}" = "yes"; then
@@ -25679,9 +24747,8 @@ fi
OSS_INCLUDE="-I${OSS_DIR}/include"
fi
OSS_INCLUDE="${OSS_INCLUDE} "
- if test "xsoundcard.h" = "x" ; then # no header, assume found
- OSS_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "soundcard.h" "ac_cv_header_soundcard_h" "$ac_includes_default"
@@ -25693,14 +24760,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${OSS_HEADER_FOUND}" = "x0" ; then
OSS_LIB=""
OSS_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- OSS_LIB=""
- fi
+
PBX_OSS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_OSS 1
@@ -26143,16 +25208,12 @@ if test "x${PBX_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK}" != "x1" -a "${USE_PJSIP_DLG_
pbxlibdir="-L${PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_DIR}"
fi
fi
- pbxfuncname="pjsip_dlg_create_uas_and_inc_lock"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
- as_ac_Lib=`$as_echo "ac_cv_lib_pjsip_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpjsip" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpjsip... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_dlg_create_uas_and_inc_lock in -lpjsip" >&5
+$as_echo_n "checking for pjsip_dlg_create_uas_and_inc_lock in -lpjsip... " >&6; }
+if ${ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -26166,35 +25227,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pjsip_dlg_create_uas_and_inc_lock ();
int
main ()
{
-return ${pbxfuncname} ();
+return pjsip_dlg_create_uas_and_inc_lock ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock" >&5
+$as_echo "$ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock" >&6; }
+if test "x$ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock" = xyes; then :
AST_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_FOUND=yes
else
AST_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_FOUND}" = "yes"; then
@@ -26204,9 +25264,8 @@ fi
PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_INCLUDE="-I${PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_DIR}/include"
fi
PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_INCLUDE="${PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_INCLUDE} $PJPROJECT_CFLAGS"
- if test "xpjsip.h" = "x" ; then # no header, assume found
- PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
@@ -26218,14 +25277,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_HEADER_FOUND}" = "x0" ; then
PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_LIB=""
PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_LIB=""
- fi
+
PBX_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK 1
@@ -26247,16 +25304,12 @@ if test "x${PBX_PJ_TRANSACTION_GRP_LOCK}" != "x1" -a "${USE_PJ_TRANSACTION_GRP_L
pbxlibdir="-L${PJ_TRANSACTION_GRP_LOCK_DIR}"
fi
fi
- pbxfuncname="pjsip_tsx_create_uac2"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PJ_TRANSACTION_GRP_LOCK_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
- as_ac_Lib=`$as_echo "ac_cv_lib_pjsip_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpjsip" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpjsip... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_tsx_create_uac2 in -lpjsip" >&5
+$as_echo_n "checking for pjsip_tsx_create_uac2 in -lpjsip... " >&6; }
+if ${ac_cv_lib_pjsip_pjsip_tsx_create_uac2+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -26270,35 +25323,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pjsip_tsx_create_uac2 ();
int
main ()
{
-return ${pbxfuncname} ();
+return pjsip_tsx_create_uac2 ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pjsip_pjsip_tsx_create_uac2=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pjsip_pjsip_tsx_create_uac2=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_tsx_create_uac2" >&5
+$as_echo "$ac_cv_lib_pjsip_pjsip_tsx_create_uac2" >&6; }
+if test "x$ac_cv_lib_pjsip_pjsip_tsx_create_uac2" = xyes; then :
AST_PJ_TRANSACTION_GRP_LOCK_FOUND=yes
else
AST_PJ_TRANSACTION_GRP_LOCK_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PJ_TRANSACTION_GRP_LOCK_FOUND}" = "yes"; then
@@ -26308,9 +25360,8 @@ fi
PJ_TRANSACTION_GRP_LOCK_INCLUDE="-I${PJ_TRANSACTION_GRP_LOCK_DIR}/include"
fi
PJ_TRANSACTION_GRP_LOCK_INCLUDE="${PJ_TRANSACTION_GRP_LOCK_INCLUDE} $PJPROJECT_CFLAGS"
- if test "xpjsip.h" = "x" ; then # no header, assume found
- PJ_TRANSACTION_GRP_LOCK_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PJ_TRANSACTION_GRP_LOCK_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
@@ -26322,14 +25373,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PJ_TRANSACTION_GRP_LOCK_HEADER_FOUND}" = "x0" ; then
PJ_TRANSACTION_GRP_LOCK_LIB=""
PJ_TRANSACTION_GRP_LOCK_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PJ_TRANSACTION_GRP_LOCK_LIB=""
- fi
+
PBX_PJ_TRANSACTION_GRP_LOCK=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PJ_TRANSACTION_GRP_LOCK 1
@@ -26347,13 +25396,8 @@ fi
LIBS="${LIBS} ${PJPROJECT_LIB}"
if test "x${PBX_PJSIP_REPLACE_MEDIA_STREAM}" != "x1" -a "${USE_PJSIP_REPLACE_MEDIA_STREAM}" != "no"; then
- if test "x" != "x"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for " >&5
-$as_echo_n "checking for ... " >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE\" compiles using pjmedia.h" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE\" compiles using pjmedia.h" >&5
$as_echo_n "checking if \"pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE\" compiles using pjmedia.h... " >&6; }
- fi
saved_cppflags="${CPPFLAGS}"
if test "x${PJSIP_REPLACE_MEDIA_STREAM_DIR}" != "x"; then
PJSIP_REPLACE_MEDIA_STREAM_INCLUDE="-I${PJSIP_REPLACE_MEDIA_STREAM_DIR}/include"
@@ -26404,16 +25448,12 @@ if test "x${PBX_PJSIP_GET_DEST_INFO}" != "x1" -a "${USE_PJSIP_GET_DEST_INFO}" !=
pbxlibdir="-L${PJSIP_GET_DEST_INFO_DIR}"
fi
fi
- pbxfuncname="pjsip_get_dest_info"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PJSIP_GET_DEST_INFO_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
- as_ac_Lib=`$as_echo "ac_cv_lib_pjsip_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpjsip" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpjsip... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_get_dest_info in -lpjsip" >&5
+$as_echo_n "checking for pjsip_get_dest_info in -lpjsip... " >&6; }
+if ${ac_cv_lib_pjsip_pjsip_get_dest_info+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -26427,35 +25467,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pjsip_get_dest_info ();
int
main ()
{
-return ${pbxfuncname} ();
+return pjsip_get_dest_info ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pjsip_pjsip_get_dest_info=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pjsip_pjsip_get_dest_info=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_get_dest_info" >&5
+$as_echo "$ac_cv_lib_pjsip_pjsip_get_dest_info" >&6; }
+if test "x$ac_cv_lib_pjsip_pjsip_get_dest_info" = xyes; then :
AST_PJSIP_GET_DEST_INFO_FOUND=yes
else
AST_PJSIP_GET_DEST_INFO_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PJSIP_GET_DEST_INFO_FOUND}" = "yes"; then
@@ -26465,9 +25504,8 @@ fi
PJSIP_GET_DEST_INFO_INCLUDE="-I${PJSIP_GET_DEST_INFO_DIR}/include"
fi
PJSIP_GET_DEST_INFO_INCLUDE="${PJSIP_GET_DEST_INFO_INCLUDE} $PJPROJECT_CFLAGS"
- if test "xpjsip.h" = "x" ; then # no header, assume found
- PJSIP_GET_DEST_INFO_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PJSIP_GET_DEST_INFO_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
@@ -26479,14 +25517,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PJSIP_GET_DEST_INFO_HEADER_FOUND}" = "x0" ; then
PJSIP_GET_DEST_INFO_LIB=""
PJSIP_GET_DEST_INFO_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PJSIP_GET_DEST_INFO_LIB=""
- fi
+
PBX_PJSIP_GET_DEST_INFO=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PJSIP_GET_DEST_INFO 1
@@ -26508,16 +25544,12 @@ if test "x${PBX_PJ_SSL_CERT_LOAD_FROM_FILES2}" != "x1" -a "${USE_PJ_SSL_CERT_LOA
pbxlibdir="-L${PJ_SSL_CERT_LOAD_FROM_FILES2_DIR}"
fi
fi
- pbxfuncname="pj_ssl_cert_load_from_files2"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PJ_SSL_CERT_LOAD_FROM_FILES2_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
- as_ac_Lib=`$as_echo "ac_cv_lib_pj_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpj" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpj... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pj_ssl_cert_load_from_files2 in -lpj" >&5
+$as_echo_n "checking for pj_ssl_cert_load_from_files2 in -lpj... " >&6; }
+if ${ac_cv_lib_pj_pj_ssl_cert_load_from_files2+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -26531,35 +25563,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pj_ssl_cert_load_from_files2 ();
int
main ()
{
-return ${pbxfuncname} ();
+return pj_ssl_cert_load_from_files2 ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pj_pj_ssl_cert_load_from_files2=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pj_pj_ssl_cert_load_from_files2=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pj_pj_ssl_cert_load_from_files2" >&5
+$as_echo "$ac_cv_lib_pj_pj_ssl_cert_load_from_files2" >&6; }
+if test "x$ac_cv_lib_pj_pj_ssl_cert_load_from_files2" = xyes; then :
AST_PJ_SSL_CERT_LOAD_FROM_FILES2_FOUND=yes
else
AST_PJ_SSL_CERT_LOAD_FROM_FILES2_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PJ_SSL_CERT_LOAD_FROM_FILES2_FOUND}" = "yes"; then
@@ -26569,9 +25600,8 @@ fi
PJ_SSL_CERT_LOAD_FROM_FILES2_INCLUDE="-I${PJ_SSL_CERT_LOAD_FROM_FILES2_DIR}/include"
fi
PJ_SSL_CERT_LOAD_FROM_FILES2_INCLUDE="${PJ_SSL_CERT_LOAD_FROM_FILES2_INCLUDE} $PJPROJECT_CFLAGS"
- if test "xpjlib.h" = "x" ; then # no header, assume found
- PJ_SSL_CERT_LOAD_FROM_FILES2_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PJ_SSL_CERT_LOAD_FROM_FILES2_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "pjlib.h" "ac_cv_header_pjlib_h" "$ac_includes_default"
@@ -26583,14 +25613,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PJ_SSL_CERT_LOAD_FROM_FILES2_HEADER_FOUND}" = "x0" ; then
PJ_SSL_CERT_LOAD_FROM_FILES2_LIB=""
PJ_SSL_CERT_LOAD_FROM_FILES2_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PJ_SSL_CERT_LOAD_FROM_FILES2_LIB=""
- fi
+
PBX_PJ_SSL_CERT_LOAD_FROM_FILES2=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PJ_SSL_CERT_LOAD_FROM_FILES2 1
@@ -26612,16 +25640,12 @@ if test "x${PBX_PJSIP_EXTERNAL_RESOLVER}" != "x1" -a "${USE_PJSIP_EXTERNAL_RESOL
pbxlibdir="-L${PJSIP_EXTERNAL_RESOLVER_DIR}"
fi
fi
- pbxfuncname="pjsip_endpt_set_ext_resolver"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PJSIP_EXTERNAL_RESOLVER_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
- as_ac_Lib=`$as_echo "ac_cv_lib_pjsip_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpjsip" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpjsip... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_endpt_set_ext_resolver in -lpjsip" >&5
+$as_echo_n "checking for pjsip_endpt_set_ext_resolver in -lpjsip... " >&6; }
+if ${ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -26635,35 +25659,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pjsip_endpt_set_ext_resolver ();
int
main ()
{
-return ${pbxfuncname} ();
+return pjsip_endpt_set_ext_resolver ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver" >&5
+$as_echo "$ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver" >&6; }
+if test "x$ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver" = xyes; then :
AST_PJSIP_EXTERNAL_RESOLVER_FOUND=yes
else
AST_PJSIP_EXTERNAL_RESOLVER_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PJSIP_EXTERNAL_RESOLVER_FOUND}" = "yes"; then
@@ -26673,9 +25696,8 @@ fi
PJSIP_EXTERNAL_RESOLVER_INCLUDE="-I${PJSIP_EXTERNAL_RESOLVER_DIR}/include"
fi
PJSIP_EXTERNAL_RESOLVER_INCLUDE="${PJSIP_EXTERNAL_RESOLVER_INCLUDE} $PJPROJECT_CFLAGS"
- if test "xpjsip.h" = "x" ; then # no header, assume found
- PJSIP_EXTERNAL_RESOLVER_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PJSIP_EXTERNAL_RESOLVER_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
@@ -26687,14 +25709,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PJSIP_EXTERNAL_RESOLVER_HEADER_FOUND}" = "x0" ; then
PJSIP_EXTERNAL_RESOLVER_LIB=""
PJSIP_EXTERNAL_RESOLVER_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PJSIP_EXTERNAL_RESOLVER_LIB=""
- fi
+
PBX_PJSIP_EXTERNAL_RESOLVER=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PJSIP_EXTERNAL_RESOLVER 1
@@ -26712,13 +25732,8 @@ fi
LIBS="${LIBS} ${PJPROJECT_LIB}"
if test "x${PBX_PJSIP_TLS_TRANSPORT_PROTO}" != "x1" -a "${USE_PJSIP_TLS_TRANSPORT_PROTO}" != "no"; then
- if test "x" != "x"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for " >&5
-$as_echo_n "checking for ... " >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"struct pjsip_tls_setting setting; int proto; proto = setting.proto;\" compiles using pjsip.h" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"struct pjsip_tls_setting setting; int proto; proto = setting.proto;\" compiles using pjsip.h" >&5
$as_echo_n "checking if \"struct pjsip_tls_setting setting; int proto; proto = setting.proto;\" compiles using pjsip.h... " >&6; }
- fi
saved_cppflags="${CPPFLAGS}"
if test "x${PJSIP_TLS_TRANSPORT_PROTO_DIR}" != "x"; then
PJSIP_TLS_TRANSPORT_PROTO_INCLUDE="-I${PJSIP_TLS_TRANSPORT_PROTO_DIR}/include"
@@ -26769,16 +25784,12 @@ if test "x${PBX_PJSIP_EVSUB_GRP_LOCK}" != "x1" -a "${USE_PJSIP_EVSUB_GRP_LOCK}"
pbxlibdir="-L${PJSIP_EVSUB_GRP_LOCK_DIR}"
fi
fi
- pbxfuncname="pjsip_evsub_add_ref"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PJSIP_EVSUB_GRP_LOCK_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
- as_ac_Lib=`$as_echo "ac_cv_lib_pjsip_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpjsip" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpjsip... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_evsub_add_ref in -lpjsip" >&5
+$as_echo_n "checking for pjsip_evsub_add_ref in -lpjsip... " >&6; }
+if ${ac_cv_lib_pjsip_pjsip_evsub_add_ref+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -26792,35 +25803,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pjsip_evsub_add_ref ();
int
main ()
{
-return ${pbxfuncname} ();
+return pjsip_evsub_add_ref ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pjsip_pjsip_evsub_add_ref=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pjsip_pjsip_evsub_add_ref=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_evsub_add_ref" >&5
+$as_echo "$ac_cv_lib_pjsip_pjsip_evsub_add_ref" >&6; }
+if test "x$ac_cv_lib_pjsip_pjsip_evsub_add_ref" = xyes; then :
AST_PJSIP_EVSUB_GRP_LOCK_FOUND=yes
else
AST_PJSIP_EVSUB_GRP_LOCK_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PJSIP_EVSUB_GRP_LOCK_FOUND}" = "yes"; then
@@ -26830,9 +25840,8 @@ fi
PJSIP_EVSUB_GRP_LOCK_INCLUDE="-I${PJSIP_EVSUB_GRP_LOCK_DIR}/include"
fi
PJSIP_EVSUB_GRP_LOCK_INCLUDE="${PJSIP_EVSUB_GRP_LOCK_INCLUDE} $PJPROJECT_CFLAGS"
- if test "xpjsip.h" = "x" ; then # no header, assume found
- PJSIP_EVSUB_GRP_LOCK_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PJSIP_EVSUB_GRP_LOCK_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
@@ -26844,14 +25853,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PJSIP_EVSUB_GRP_LOCK_HEADER_FOUND}" = "x0" ; then
PJSIP_EVSUB_GRP_LOCK_LIB=""
PJSIP_EVSUB_GRP_LOCK_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PJSIP_EVSUB_GRP_LOCK_LIB=""
- fi
+
PBX_PJSIP_EVSUB_GRP_LOCK=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PJSIP_EVSUB_GRP_LOCK 1
@@ -26873,16 +25880,12 @@ if test "x${PBX_PJSIP_INV_SESSION_REF}" != "x1" -a "${USE_PJSIP_INV_SESSION_REF}
pbxlibdir="-L${PJSIP_INV_SESSION_REF_DIR}"
fi
fi
- pbxfuncname="pjsip_inv_add_ref"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PJSIP_INV_SESSION_REF_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
- as_ac_Lib=`$as_echo "ac_cv_lib_pjsip_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpjsip" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpjsip... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_inv_add_ref in -lpjsip" >&5
+$as_echo_n "checking for pjsip_inv_add_ref in -lpjsip... " >&6; }
+if ${ac_cv_lib_pjsip_pjsip_inv_add_ref+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -26896,35 +25899,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pjsip_inv_add_ref ();
int
main ()
{
-return ${pbxfuncname} ();
+return pjsip_inv_add_ref ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pjsip_pjsip_inv_add_ref=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pjsip_pjsip_inv_add_ref=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_inv_add_ref" >&5
+$as_echo "$ac_cv_lib_pjsip_pjsip_inv_add_ref" >&6; }
+if test "x$ac_cv_lib_pjsip_pjsip_inv_add_ref" = xyes; then :
AST_PJSIP_INV_SESSION_REF_FOUND=yes
else
AST_PJSIP_INV_SESSION_REF_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PJSIP_INV_SESSION_REF_FOUND}" = "yes"; then
@@ -26934,9 +25936,8 @@ fi
PJSIP_INV_SESSION_REF_INCLUDE="-I${PJSIP_INV_SESSION_REF_DIR}/include"
fi
PJSIP_INV_SESSION_REF_INCLUDE="${PJSIP_INV_SESSION_REF_INCLUDE} $PJPROJECT_CFLAGS"
- if test "xpjsip.h" = "x" ; then # no header, assume found
- PJSIP_INV_SESSION_REF_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PJSIP_INV_SESSION_REF_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
@@ -26948,14 +25949,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PJSIP_INV_SESSION_REF_HEADER_FOUND}" = "x0" ; then
PJSIP_INV_SESSION_REF_LIB=""
PJSIP_INV_SESSION_REF_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PJSIP_INV_SESSION_REF_LIB=""
- fi
+
PBX_PJSIP_INV_SESSION_REF=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PJSIP_INV_SESSION_REF 1
@@ -26977,16 +25976,12 @@ if test "x${PBX_PJSIP_AUTH_CLT_DEINIT}" != "x1" -a "${USE_PJSIP_AUTH_CLT_DEINIT}
pbxlibdir="-L${PJSIP_AUTH_CLT_DEINIT_DIR}"
fi
fi
- pbxfuncname="pjsip_auth_clt_deinit"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PJSIP_AUTH_CLT_DEINIT_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
- as_ac_Lib=`$as_echo "ac_cv_lib_pjsip_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpjsip" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpjsip... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_auth_clt_deinit in -lpjsip" >&5
+$as_echo_n "checking for pjsip_auth_clt_deinit in -lpjsip... " >&6; }
+if ${ac_cv_lib_pjsip_pjsip_auth_clt_deinit+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -27000,35 +25995,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pjsip_auth_clt_deinit ();
int
main ()
{
-return ${pbxfuncname} ();
+return pjsip_auth_clt_deinit ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pjsip_pjsip_auth_clt_deinit=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pjsip_pjsip_auth_clt_deinit=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_auth_clt_deinit" >&5
+$as_echo "$ac_cv_lib_pjsip_pjsip_auth_clt_deinit" >&6; }
+if test "x$ac_cv_lib_pjsip_pjsip_auth_clt_deinit" = xyes; then :
AST_PJSIP_AUTH_CLT_DEINIT_FOUND=yes
else
AST_PJSIP_AUTH_CLT_DEINIT_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PJSIP_AUTH_CLT_DEINIT_FOUND}" = "yes"; then
@@ -27038,9 +26032,8 @@ fi
PJSIP_AUTH_CLT_DEINIT_INCLUDE="-I${PJSIP_AUTH_CLT_DEINIT_DIR}/include"
fi
PJSIP_AUTH_CLT_DEINIT_INCLUDE="${PJSIP_AUTH_CLT_DEINIT_INCLUDE} $PJPROJECT_CFLAGS"
- if test "xpjsip.h" = "x" ; then # no header, assume found
- PJSIP_AUTH_CLT_DEINIT_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PJSIP_AUTH_CLT_DEINIT_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
@@ -27052,14 +26045,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PJSIP_AUTH_CLT_DEINIT_HEADER_FOUND}" = "x0" ; then
PJSIP_AUTH_CLT_DEINIT_LIB=""
PJSIP_AUTH_CLT_DEINIT_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PJSIP_AUTH_CLT_DEINIT_LIB=""
- fi
+
PBX_PJSIP_AUTH_CLT_DEINIT=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PJSIP_AUTH_CLT_DEINIT 1
@@ -27081,16 +26072,12 @@ if test "x${PBX_PJSIP_EVSUB_SET_UAS_TIMEOUT}" != "x1" -a "${USE_PJSIP_EVSUB_SET_
pbxlibdir="-L${PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR}"
fi
fi
- pbxfuncname="pjsip_evsub_set_uas_timeout"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PJSIP_EVSUB_SET_UAS_TIMEOUT_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
- as_ac_Lib=`$as_echo "ac_cv_lib_pjsip_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpjsip" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpjsip... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_evsub_set_uas_timeout in -lpjsip" >&5
+$as_echo_n "checking for pjsip_evsub_set_uas_timeout in -lpjsip... " >&6; }
+if ${ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -27104,35 +26091,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pjsip_evsub_set_uas_timeout ();
int
main ()
{
-return ${pbxfuncname} ();
+return pjsip_evsub_set_uas_timeout ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout" >&5
+$as_echo "$ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout" >&6; }
+if test "x$ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout" = xyes; then :
AST_PJSIP_EVSUB_SET_UAS_TIMEOUT_FOUND=yes
else
AST_PJSIP_EVSUB_SET_UAS_TIMEOUT_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PJSIP_EVSUB_SET_UAS_TIMEOUT_FOUND}" = "yes"; then
@@ -27142,9 +26128,8 @@ fi
PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE="-I${PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR}/include"
fi
PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE="${PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE} $PJPROJECT_CFLAGS"
- if test "xpjsip.h" = "x" ; then # no header, assume found
- PJSIP_EVSUB_SET_UAS_TIMEOUT_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
@@ -27156,14 +26141,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PJSIP_EVSUB_SET_UAS_TIMEOUT_HEADER_FOUND}" = "x0" ; then
PJSIP_EVSUB_SET_UAS_TIMEOUT_LIB=""
PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PJSIP_EVSUB_SET_UAS_TIMEOUT_LIB=""
- fi
+
PBX_PJSIP_EVSUB_SET_UAS_TIMEOUT=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PJSIP_EVSUB_SET_UAS_TIMEOUT 1
@@ -27185,16 +26168,12 @@ if test "x${PBX_PJSIP_TSX_LAYER_FIND_TSX2}" != "x1" -a "${USE_PJSIP_TSX_LAYER_FI
pbxlibdir="-L${PJSIP_TSX_LAYER_FIND_TSX2_DIR}"
fi
fi
- pbxfuncname="pjsip_tsx_layer_find_tsx2"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PJSIP_TSX_LAYER_FIND_TSX2_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
- as_ac_Lib=`$as_echo "ac_cv_lib_pjsip_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpjsip" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpjsip... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_tsx_layer_find_tsx2 in -lpjsip" >&5
+$as_echo_n "checking for pjsip_tsx_layer_find_tsx2 in -lpjsip... " >&6; }
+if ${ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -27208,35 +26187,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pjsip_tsx_layer_find_tsx2 ();
int
main ()
{
-return ${pbxfuncname} ();
+return pjsip_tsx_layer_find_tsx2 ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2" >&5
+$as_echo "$ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2" >&6; }
+if test "x$ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2" = xyes; then :
AST_PJSIP_TSX_LAYER_FIND_TSX2_FOUND=yes
else
AST_PJSIP_TSX_LAYER_FIND_TSX2_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PJSIP_TSX_LAYER_FIND_TSX2_FOUND}" = "yes"; then
@@ -27246,9 +26224,8 @@ fi
PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE="-I${PJSIP_TSX_LAYER_FIND_TSX2_DIR}/include"
fi
PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE="${PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE} $PJPROJECT_CFLAGS"
- if test "xpjsip.h" = "x" ; then # no header, assume found
- PJSIP_TSX_LAYER_FIND_TSX2_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
@@ -27260,14 +26237,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PJSIP_TSX_LAYER_FIND_TSX2_HEADER_FOUND}" = "x0" ; then
PJSIP_TSX_LAYER_FIND_TSX2_LIB=""
PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PJSIP_TSX_LAYER_FIND_TSX2_LIB=""
- fi
+
PBX_PJSIP_TSX_LAYER_FIND_TSX2=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PJSIP_TSX_LAYER_FIND_TSX2 1
@@ -27383,16 +26358,12 @@ if test "x${PBX_POPT}" != "x1" -a "${USE_POPT}" != "no"; then
pbxlibdir="-L${POPT_DIR}"
fi
fi
- pbxfuncname="poptStrerror"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_POPT_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_popt_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpopt" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpopt... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poptStrerror in -lpopt" >&5
+$as_echo_n "checking for poptStrerror in -lpopt... " >&6; }
+if ${ac_cv_lib_popt_poptStrerror+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -27406,35 +26377,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char poptStrerror ();
int
main ()
{
-return ${pbxfuncname} ();
+return poptStrerror ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_popt_poptStrerror=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_popt_poptStrerror=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_popt_poptStrerror" >&5
+$as_echo "$ac_cv_lib_popt_poptStrerror" >&6; }
+if test "x$ac_cv_lib_popt_poptStrerror" = xyes; then :
AST_POPT_FOUND=yes
else
AST_POPT_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_POPT_FOUND}" = "yes"; then
@@ -27444,9 +26414,8 @@ fi
POPT_INCLUDE="-I${POPT_DIR}/include"
fi
POPT_INCLUDE="${POPT_INCLUDE} "
- if test "xpopt.h" = "x" ; then # no header, assume found
- POPT_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${POPT_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "popt.h" "ac_cv_header_popt_h" "$ac_includes_default"
@@ -27458,14 +26427,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${POPT_HEADER_FOUND}" = "x0" ; then
POPT_LIB=""
POPT_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- POPT_LIB=""
- fi
+
PBX_POPT=1
cat >>confdefs.h <<_ACEOF
#define HAVE_POPT 1
@@ -27488,16 +26455,12 @@ if test "x${PBX_PORTAUDIO}" != "x1" -a "${USE_PORTAUDIO}" != "no"; then
pbxlibdir="-L${PORTAUDIO_DIR}"
fi
fi
- pbxfuncname="Pa_GetDeviceCount"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PORTAUDIO_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_portaudio_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lportaudio" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lportaudio... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Pa_GetDeviceCount in -lportaudio" >&5
+$as_echo_n "checking for Pa_GetDeviceCount in -lportaudio... " >&6; }
+if ${ac_cv_lib_portaudio_Pa_GetDeviceCount+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -27511,35 +26474,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char Pa_GetDeviceCount ();
int
main ()
{
-return ${pbxfuncname} ();
+return Pa_GetDeviceCount ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_portaudio_Pa_GetDeviceCount=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_portaudio_Pa_GetDeviceCount=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_portaudio_Pa_GetDeviceCount" >&5
+$as_echo "$ac_cv_lib_portaudio_Pa_GetDeviceCount" >&6; }
+if test "x$ac_cv_lib_portaudio_Pa_GetDeviceCount" = xyes; then :
AST_PORTAUDIO_FOUND=yes
else
AST_PORTAUDIO_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PORTAUDIO_FOUND}" = "yes"; then
@@ -27549,9 +26511,8 @@ fi
PORTAUDIO_INCLUDE="-I${PORTAUDIO_DIR}/include"
fi
PORTAUDIO_INCLUDE="${PORTAUDIO_INCLUDE} "
- if test "xportaudio.h" = "x" ; then # no header, assume found
- PORTAUDIO_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PORTAUDIO_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "portaudio.h" "ac_cv_header_portaudio_h" "$ac_includes_default"
@@ -27563,14 +26524,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PORTAUDIO_HEADER_FOUND}" = "x0" ; then
PORTAUDIO_LIB=""
PORTAUDIO_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PORTAUDIO_LIB=""
- fi
+
PBX_PORTAUDIO=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PORTAUDIO 1
@@ -27593,16 +26552,12 @@ if test "x${PBX_PRI}" != "x1" -a "${USE_PRI}" != "no"; then
pbxlibdir="-L${PRI_DIR}"
fi
fi
- pbxfuncname="pri_connected_line_update"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_connected_line_update in -lpri" >&5
+$as_echo_n "checking for pri_connected_line_update in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_connected_line_update+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -27616,35 +26571,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_connected_line_update ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_connected_line_update ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_connected_line_update=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_connected_line_update=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_connected_line_update" >&5
+$as_echo "$ac_cv_lib_pri_pri_connected_line_update" >&6; }
+if test "x$ac_cv_lib_pri_pri_connected_line_update" = xyes; then :
AST_PRI_FOUND=yes
else
AST_PRI_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_FOUND}" = "yes"; then
@@ -27654,9 +26608,8 @@ fi
PRI_INCLUDE="-I${PRI_DIR}/include"
fi
PRI_INCLUDE="${PRI_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -27668,14 +26621,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_HEADER_FOUND}" = "x0" ; then
PRI_LIB=""
PRI_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_LIB=""
- fi
+
PBX_PRI=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI 1
@@ -27697,16 +26648,12 @@ if test "x${PBX_PRI_SETUP_ACK_INBAND}" != "x1" -a "${USE_PRI_SETUP_ACK_INBAND}"
pbxlibdir="-L${PRI_SETUP_ACK_INBAND_DIR}"
fi
fi
- pbxfuncname="pri_setup_ack"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_SETUP_ACK_INBAND_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_setup_ack in -lpri" >&5
+$as_echo_n "checking for pri_setup_ack in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_setup_ack+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -27720,35 +26667,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_setup_ack ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_setup_ack ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_setup_ack=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_setup_ack=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_setup_ack" >&5
+$as_echo "$ac_cv_lib_pri_pri_setup_ack" >&6; }
+if test "x$ac_cv_lib_pri_pri_setup_ack" = xyes; then :
AST_PRI_SETUP_ACK_INBAND_FOUND=yes
else
AST_PRI_SETUP_ACK_INBAND_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_SETUP_ACK_INBAND_FOUND}" = "yes"; then
@@ -27758,9 +26704,8 @@ fi
PRI_SETUP_ACK_INBAND_INCLUDE="-I${PRI_SETUP_ACK_INBAND_DIR}/include"
fi
PRI_SETUP_ACK_INBAND_INCLUDE="${PRI_SETUP_ACK_INBAND_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_SETUP_ACK_INBAND_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_SETUP_ACK_INBAND_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -27772,14 +26717,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_SETUP_ACK_INBAND_HEADER_FOUND}" = "x0" ; then
PRI_SETUP_ACK_INBAND_LIB=""
PRI_SETUP_ACK_INBAND_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_SETUP_ACK_INBAND_LIB=""
- fi
+
PBX_PRI_SETUP_ACK_INBAND=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_SETUP_ACK_INBAND 1
@@ -27801,16 +26744,12 @@ if test "x${PBX_PRI_L2_PERSISTENCE}" != "x1" -a "${USE_PRI_L2_PERSISTENCE}" != "
pbxlibdir="-L${PRI_L2_PERSISTENCE_DIR}"
fi
fi
- pbxfuncname="pri_persistent_layer2_option"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_L2_PERSISTENCE_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_persistent_layer2_option in -lpri" >&5
+$as_echo_n "checking for pri_persistent_layer2_option in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_persistent_layer2_option+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -27824,35 +26763,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_persistent_layer2_option ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_persistent_layer2_option ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_persistent_layer2_option=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_persistent_layer2_option=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_persistent_layer2_option" >&5
+$as_echo "$ac_cv_lib_pri_pri_persistent_layer2_option" >&6; }
+if test "x$ac_cv_lib_pri_pri_persistent_layer2_option" = xyes; then :
AST_PRI_L2_PERSISTENCE_FOUND=yes
else
AST_PRI_L2_PERSISTENCE_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_L2_PERSISTENCE_FOUND}" = "yes"; then
@@ -27862,9 +26800,8 @@ fi
PRI_L2_PERSISTENCE_INCLUDE="-I${PRI_L2_PERSISTENCE_DIR}/include"
fi
PRI_L2_PERSISTENCE_INCLUDE="${PRI_L2_PERSISTENCE_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_L2_PERSISTENCE_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_L2_PERSISTENCE_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -27876,14 +26813,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_L2_PERSISTENCE_HEADER_FOUND}" = "x0" ; then
PRI_L2_PERSISTENCE_LIB=""
PRI_L2_PERSISTENCE_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_L2_PERSISTENCE_LIB=""
- fi
+
PBX_PRI_L2_PERSISTENCE=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_L2_PERSISTENCE 1
@@ -27905,16 +26840,12 @@ if test "x${PBX_PRI_DATETIME_SEND}" != "x1" -a "${USE_PRI_DATETIME_SEND}" != "no
pbxlibdir="-L${PRI_DATETIME_SEND_DIR}"
fi
fi
- pbxfuncname="pri_date_time_send_option"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_DATETIME_SEND_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_date_time_send_option in -lpri" >&5
+$as_echo_n "checking for pri_date_time_send_option in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_date_time_send_option+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -27928,35 +26859,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_date_time_send_option ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_date_time_send_option ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_date_time_send_option=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_date_time_send_option=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_date_time_send_option" >&5
+$as_echo "$ac_cv_lib_pri_pri_date_time_send_option" >&6; }
+if test "x$ac_cv_lib_pri_pri_date_time_send_option" = xyes; then :
AST_PRI_DATETIME_SEND_FOUND=yes
else
AST_PRI_DATETIME_SEND_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_DATETIME_SEND_FOUND}" = "yes"; then
@@ -27966,9 +26896,8 @@ fi
PRI_DATETIME_SEND_INCLUDE="-I${PRI_DATETIME_SEND_DIR}/include"
fi
PRI_DATETIME_SEND_INCLUDE="${PRI_DATETIME_SEND_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_DATETIME_SEND_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_DATETIME_SEND_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -27980,14 +26909,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_DATETIME_SEND_HEADER_FOUND}" = "x0" ; then
PRI_DATETIME_SEND_LIB=""
PRI_DATETIME_SEND_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_DATETIME_SEND_LIB=""
- fi
+
PBX_PRI_DATETIME_SEND=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_DATETIME_SEND 1
@@ -28009,16 +26936,12 @@ if test "x${PBX_PRI_MWI_V2}" != "x1" -a "${USE_PRI_MWI_V2}" != "no"; then
pbxlibdir="-L${PRI_MWI_V2_DIR}"
fi
fi
- pbxfuncname="pri_mwi_indicate_v2"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_MWI_V2_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_mwi_indicate_v2 in -lpri" >&5
+$as_echo_n "checking for pri_mwi_indicate_v2 in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_mwi_indicate_v2+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28032,35 +26955,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_mwi_indicate_v2 ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_mwi_indicate_v2 ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_mwi_indicate_v2=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_mwi_indicate_v2=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_mwi_indicate_v2" >&5
+$as_echo "$ac_cv_lib_pri_pri_mwi_indicate_v2" >&6; }
+if test "x$ac_cv_lib_pri_pri_mwi_indicate_v2" = xyes; then :
AST_PRI_MWI_V2_FOUND=yes
else
AST_PRI_MWI_V2_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_MWI_V2_FOUND}" = "yes"; then
@@ -28070,9 +26992,8 @@ fi
PRI_MWI_V2_INCLUDE="-I${PRI_MWI_V2_DIR}/include"
fi
PRI_MWI_V2_INCLUDE="${PRI_MWI_V2_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_MWI_V2_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_MWI_V2_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -28084,14 +27005,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_MWI_V2_HEADER_FOUND}" = "x0" ; then
PRI_MWI_V2_LIB=""
PRI_MWI_V2_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_MWI_V2_LIB=""
- fi
+
PBX_PRI_MWI_V2=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_MWI_V2 1
@@ -28113,16 +27032,12 @@ if test "x${PBX_PRI_DISPLAY_TEXT}" != "x1" -a "${USE_PRI_DISPLAY_TEXT}" != "no";
pbxlibdir="-L${PRI_DISPLAY_TEXT_DIR}"
fi
fi
- pbxfuncname="pri_display_text"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_DISPLAY_TEXT_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_display_text in -lpri" >&5
+$as_echo_n "checking for pri_display_text in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_display_text+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28136,35 +27051,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_display_text ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_display_text ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_display_text=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_display_text=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_display_text" >&5
+$as_echo "$ac_cv_lib_pri_pri_display_text" >&6; }
+if test "x$ac_cv_lib_pri_pri_display_text" = xyes; then :
AST_PRI_DISPLAY_TEXT_FOUND=yes
else
AST_PRI_DISPLAY_TEXT_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_DISPLAY_TEXT_FOUND}" = "yes"; then
@@ -28174,9 +27088,8 @@ fi
PRI_DISPLAY_TEXT_INCLUDE="-I${PRI_DISPLAY_TEXT_DIR}/include"
fi
PRI_DISPLAY_TEXT_INCLUDE="${PRI_DISPLAY_TEXT_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_DISPLAY_TEXT_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_DISPLAY_TEXT_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -28188,14 +27101,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_DISPLAY_TEXT_HEADER_FOUND}" = "x0" ; then
PRI_DISPLAY_TEXT_LIB=""
PRI_DISPLAY_TEXT_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_DISPLAY_TEXT_LIB=""
- fi
+
PBX_PRI_DISPLAY_TEXT=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_DISPLAY_TEXT 1
@@ -28217,16 +27128,12 @@ if test "x${PBX_PRI_MWI}" != "x1" -a "${USE_PRI_MWI}" != "no"; then
pbxlibdir="-L${PRI_MWI_DIR}"
fi
fi
- pbxfuncname="pri_mwi_indicate"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_MWI_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_mwi_indicate in -lpri" >&5
+$as_echo_n "checking for pri_mwi_indicate in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_mwi_indicate+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28240,35 +27147,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_mwi_indicate ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_mwi_indicate ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_mwi_indicate=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_mwi_indicate=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_mwi_indicate" >&5
+$as_echo "$ac_cv_lib_pri_pri_mwi_indicate" >&6; }
+if test "x$ac_cv_lib_pri_pri_mwi_indicate" = xyes; then :
AST_PRI_MWI_FOUND=yes
else
AST_PRI_MWI_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_MWI_FOUND}" = "yes"; then
@@ -28278,9 +27184,8 @@ fi
PRI_MWI_INCLUDE="-I${PRI_MWI_DIR}/include"
fi
PRI_MWI_INCLUDE="${PRI_MWI_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_MWI_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_MWI_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -28292,14 +27197,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_MWI_HEADER_FOUND}" = "x0" ; then
PRI_MWI_LIB=""
PRI_MWI_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_MWI_LIB=""
- fi
+
PBX_PRI_MWI=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_MWI 1
@@ -28321,16 +27224,12 @@ if test "x${PBX_PRI_MCID}" != "x1" -a "${USE_PRI_MCID}" != "no"; then
pbxlibdir="-L${PRI_MCID_DIR}"
fi
fi
- pbxfuncname="pri_mcid_enable"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_MCID_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_mcid_enable in -lpri" >&5
+$as_echo_n "checking for pri_mcid_enable in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_mcid_enable+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28344,35 +27243,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_mcid_enable ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_mcid_enable ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_mcid_enable=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_mcid_enable=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_mcid_enable" >&5
+$as_echo "$ac_cv_lib_pri_pri_mcid_enable" >&6; }
+if test "x$ac_cv_lib_pri_pri_mcid_enable" = xyes; then :
AST_PRI_MCID_FOUND=yes
else
AST_PRI_MCID_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_MCID_FOUND}" = "yes"; then
@@ -28382,9 +27280,8 @@ fi
PRI_MCID_INCLUDE="-I${PRI_MCID_DIR}/include"
fi
PRI_MCID_INCLUDE="${PRI_MCID_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_MCID_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_MCID_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -28396,14 +27293,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_MCID_HEADER_FOUND}" = "x0" ; then
PRI_MCID_LIB=""
PRI_MCID_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_MCID_LIB=""
- fi
+
PBX_PRI_MCID=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_MCID 1
@@ -28425,16 +27320,12 @@ if test "x${PBX_PRI_CALL_WAITING}" != "x1" -a "${USE_PRI_CALL_WAITING}" != "no";
pbxlibdir="-L${PRI_CALL_WAITING_DIR}"
fi
fi
- pbxfuncname="pri_connect_ack_enable"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_CALL_WAITING_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_connect_ack_enable in -lpri" >&5
+$as_echo_n "checking for pri_connect_ack_enable in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_connect_ack_enable+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28448,35 +27339,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_connect_ack_enable ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_connect_ack_enable ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_connect_ack_enable=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_connect_ack_enable=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_connect_ack_enable" >&5
+$as_echo "$ac_cv_lib_pri_pri_connect_ack_enable" >&6; }
+if test "x$ac_cv_lib_pri_pri_connect_ack_enable" = xyes; then :
AST_PRI_CALL_WAITING_FOUND=yes
else
AST_PRI_CALL_WAITING_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_CALL_WAITING_FOUND}" = "yes"; then
@@ -28486,9 +27376,8 @@ fi
PRI_CALL_WAITING_INCLUDE="-I${PRI_CALL_WAITING_DIR}/include"
fi
PRI_CALL_WAITING_INCLUDE="${PRI_CALL_WAITING_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_CALL_WAITING_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_CALL_WAITING_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -28500,14 +27389,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_CALL_WAITING_HEADER_FOUND}" = "x0" ; then
PRI_CALL_WAITING_LIB=""
PRI_CALL_WAITING_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_CALL_WAITING_LIB=""
- fi
+
PBX_PRI_CALL_WAITING=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_CALL_WAITING 1
@@ -28529,16 +27416,12 @@ if test "x${PBX_PRI_AOC_EVENTS}" != "x1" -a "${USE_PRI_AOC_EVENTS}" != "no"; the
pbxlibdir="-L${PRI_AOC_EVENTS_DIR}"
fi
fi
- pbxfuncname="pri_aoc_events_enable"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_AOC_EVENTS_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_aoc_events_enable in -lpri" >&5
+$as_echo_n "checking for pri_aoc_events_enable in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_aoc_events_enable+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28552,35 +27435,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_aoc_events_enable ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_aoc_events_enable ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_aoc_events_enable=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_aoc_events_enable=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_aoc_events_enable" >&5
+$as_echo "$ac_cv_lib_pri_pri_aoc_events_enable" >&6; }
+if test "x$ac_cv_lib_pri_pri_aoc_events_enable" = xyes; then :
AST_PRI_AOC_EVENTS_FOUND=yes
else
AST_PRI_AOC_EVENTS_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_AOC_EVENTS_FOUND}" = "yes"; then
@@ -28590,9 +27472,8 @@ fi
PRI_AOC_EVENTS_INCLUDE="-I${PRI_AOC_EVENTS_DIR}/include"
fi
PRI_AOC_EVENTS_INCLUDE="${PRI_AOC_EVENTS_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_AOC_EVENTS_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_AOC_EVENTS_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -28604,14 +27485,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_AOC_EVENTS_HEADER_FOUND}" = "x0" ; then
PRI_AOC_EVENTS_LIB=""
PRI_AOC_EVENTS_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_AOC_EVENTS_LIB=""
- fi
+
PBX_PRI_AOC_EVENTS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_AOC_EVENTS 1
@@ -28633,16 +27512,12 @@ if test "x${PBX_PRI_TRANSFER}" != "x1" -a "${USE_PRI_TRANSFER}" != "no"; then
pbxlibdir="-L${PRI_TRANSFER_DIR}"
fi
fi
- pbxfuncname="pri_transfer_enable"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_TRANSFER_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_transfer_enable in -lpri" >&5
+$as_echo_n "checking for pri_transfer_enable in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_transfer_enable+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28656,35 +27531,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_transfer_enable ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_transfer_enable ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_transfer_enable=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_transfer_enable=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_transfer_enable" >&5
+$as_echo "$ac_cv_lib_pri_pri_transfer_enable" >&6; }
+if test "x$ac_cv_lib_pri_pri_transfer_enable" = xyes; then :
AST_PRI_TRANSFER_FOUND=yes
else
AST_PRI_TRANSFER_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_TRANSFER_FOUND}" = "yes"; then
@@ -28694,9 +27568,8 @@ fi
PRI_TRANSFER_INCLUDE="-I${PRI_TRANSFER_DIR}/include"
fi
PRI_TRANSFER_INCLUDE="${PRI_TRANSFER_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_TRANSFER_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_TRANSFER_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -28708,14 +27581,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_TRANSFER_HEADER_FOUND}" = "x0" ; then
PRI_TRANSFER_LIB=""
PRI_TRANSFER_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_TRANSFER_LIB=""
- fi
+
PBX_PRI_TRANSFER=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_TRANSFER 1
@@ -28737,16 +27608,12 @@ if test "x${PBX_PRI_CCSS}" != "x1" -a "${USE_PRI_CCSS}" != "no"; then
pbxlibdir="-L${PRI_CCSS_DIR}"
fi
fi
- pbxfuncname="pri_cc_enable"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_CCSS_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_cc_enable in -lpri" >&5
+$as_echo_n "checking for pri_cc_enable in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_cc_enable+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28760,35 +27627,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_cc_enable ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_cc_enable ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_cc_enable=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_cc_enable=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_cc_enable" >&5
+$as_echo "$ac_cv_lib_pri_pri_cc_enable" >&6; }
+if test "x$ac_cv_lib_pri_pri_cc_enable" = xyes; then :
AST_PRI_CCSS_FOUND=yes
else
AST_PRI_CCSS_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_CCSS_FOUND}" = "yes"; then
@@ -28798,9 +27664,8 @@ fi
PRI_CCSS_INCLUDE="-I${PRI_CCSS_DIR}/include"
fi
PRI_CCSS_INCLUDE="${PRI_CCSS_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_CCSS_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_CCSS_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -28812,14 +27677,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_CCSS_HEADER_FOUND}" = "x0" ; then
PRI_CCSS_LIB=""
PRI_CCSS_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_CCSS_LIB=""
- fi
+
PBX_PRI_CCSS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_CCSS 1
@@ -28841,16 +27704,12 @@ if test "x${PBX_PRI_HANGUP_FIX}" != "x1" -a "${USE_PRI_HANGUP_FIX}" != "no"; the
pbxlibdir="-L${PRI_HANGUP_FIX_DIR}"
fi
fi
- pbxfuncname="pri_hangup_fix_enable"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_HANGUP_FIX_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_hangup_fix_enable in -lpri" >&5
+$as_echo_n "checking for pri_hangup_fix_enable in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_hangup_fix_enable+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28864,35 +27723,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_hangup_fix_enable ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_hangup_fix_enable ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_hangup_fix_enable=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_hangup_fix_enable=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_hangup_fix_enable" >&5
+$as_echo "$ac_cv_lib_pri_pri_hangup_fix_enable" >&6; }
+if test "x$ac_cv_lib_pri_pri_hangup_fix_enable" = xyes; then :
AST_PRI_HANGUP_FIX_FOUND=yes
else
AST_PRI_HANGUP_FIX_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_HANGUP_FIX_FOUND}" = "yes"; then
@@ -28902,9 +27760,8 @@ fi
PRI_HANGUP_FIX_INCLUDE="-I${PRI_HANGUP_FIX_DIR}/include"
fi
PRI_HANGUP_FIX_INCLUDE="${PRI_HANGUP_FIX_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_HANGUP_FIX_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_HANGUP_FIX_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -28916,14 +27773,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_HANGUP_FIX_HEADER_FOUND}" = "x0" ; then
PRI_HANGUP_FIX_LIB=""
PRI_HANGUP_FIX_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_HANGUP_FIX_LIB=""
- fi
+
PBX_PRI_HANGUP_FIX=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_HANGUP_FIX 1
@@ -28945,16 +27800,12 @@ if test "x${PBX_PRI_SUBADDR}" != "x1" -a "${USE_PRI_SUBADDR}" != "no"; then
pbxlibdir="-L${PRI_SUBADDR_DIR}"
fi
fi
- pbxfuncname="pri_sr_set_called_subaddress"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_SUBADDR_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_sr_set_called_subaddress in -lpri" >&5
+$as_echo_n "checking for pri_sr_set_called_subaddress in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_sr_set_called_subaddress+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28968,35 +27819,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_sr_set_called_subaddress ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_sr_set_called_subaddress ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_sr_set_called_subaddress=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_sr_set_called_subaddress=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_sr_set_called_subaddress" >&5
+$as_echo "$ac_cv_lib_pri_pri_sr_set_called_subaddress" >&6; }
+if test "x$ac_cv_lib_pri_pri_sr_set_called_subaddress" = xyes; then :
AST_PRI_SUBADDR_FOUND=yes
else
AST_PRI_SUBADDR_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_SUBADDR_FOUND}" = "yes"; then
@@ -29006,9 +27856,8 @@ fi
PRI_SUBADDR_INCLUDE="-I${PRI_SUBADDR_DIR}/include"
fi
PRI_SUBADDR_INCLUDE="${PRI_SUBADDR_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_SUBADDR_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_SUBADDR_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -29020,14 +27869,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_SUBADDR_HEADER_FOUND}" = "x0" ; then
PRI_SUBADDR_LIB=""
PRI_SUBADDR_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_SUBADDR_LIB=""
- fi
+
PBX_PRI_SUBADDR=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_SUBADDR 1
@@ -29049,16 +27896,12 @@ if test "x${PBX_PRI_CALL_HOLD}" != "x1" -a "${USE_PRI_CALL_HOLD}" != "no"; then
pbxlibdir="-L${PRI_CALL_HOLD_DIR}"
fi
fi
- pbxfuncname="pri_hold_enable"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_CALL_HOLD_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_hold_enable in -lpri" >&5
+$as_echo_n "checking for pri_hold_enable in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_hold_enable+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -29072,35 +27915,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_hold_enable ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_hold_enable ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_hold_enable=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_hold_enable=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_hold_enable" >&5
+$as_echo "$ac_cv_lib_pri_pri_hold_enable" >&6; }
+if test "x$ac_cv_lib_pri_pri_hold_enable" = xyes; then :
AST_PRI_CALL_HOLD_FOUND=yes
else
AST_PRI_CALL_HOLD_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_CALL_HOLD_FOUND}" = "yes"; then
@@ -29110,9 +27952,8 @@ fi
PRI_CALL_HOLD_INCLUDE="-I${PRI_CALL_HOLD_DIR}/include"
fi
PRI_CALL_HOLD_INCLUDE="${PRI_CALL_HOLD_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_CALL_HOLD_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_CALL_HOLD_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -29124,14 +27965,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_CALL_HOLD_HEADER_FOUND}" = "x0" ; then
PRI_CALL_HOLD_LIB=""
PRI_CALL_HOLD_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_CALL_HOLD_LIB=""
- fi
+
PBX_PRI_CALL_HOLD=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_CALL_HOLD 1
@@ -29153,16 +27992,12 @@ if test "x${PBX_PRI_CALL_REROUTING}" != "x1" -a "${USE_PRI_CALL_REROUTING}" != "
pbxlibdir="-L${PRI_CALL_REROUTING_DIR}"
fi
fi
- pbxfuncname="pri_reroute_enable"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_CALL_REROUTING_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_reroute_enable in -lpri" >&5
+$as_echo_n "checking for pri_reroute_enable in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_reroute_enable+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -29176,35 +28011,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_reroute_enable ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_reroute_enable ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_reroute_enable=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_reroute_enable=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_reroute_enable" >&5
+$as_echo "$ac_cv_lib_pri_pri_reroute_enable" >&6; }
+if test "x$ac_cv_lib_pri_pri_reroute_enable" = xyes; then :
AST_PRI_CALL_REROUTING_FOUND=yes
else
AST_PRI_CALL_REROUTING_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_CALL_REROUTING_FOUND}" = "yes"; then
@@ -29214,9 +28048,8 @@ fi
PRI_CALL_REROUTING_INCLUDE="-I${PRI_CALL_REROUTING_DIR}/include"
fi
PRI_CALL_REROUTING_INCLUDE="${PRI_CALL_REROUTING_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_CALL_REROUTING_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_CALL_REROUTING_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -29228,14 +28061,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_CALL_REROUTING_HEADER_FOUND}" = "x0" ; then
PRI_CALL_REROUTING_LIB=""
PRI_CALL_REROUTING_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_CALL_REROUTING_LIB=""
- fi
+
PBX_PRI_CALL_REROUTING=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_CALL_REROUTING 1
@@ -29257,16 +28088,12 @@ if test "x${PBX_PRI_SETUP_KEYPAD}" != "x1" -a "${USE_PRI_SETUP_KEYPAD}" != "no";
pbxlibdir="-L${PRI_SETUP_KEYPAD_DIR}"
fi
fi
- pbxfuncname="pri_sr_set_keypad_digits"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_SETUP_KEYPAD_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_sr_set_keypad_digits in -lpri" >&5
+$as_echo_n "checking for pri_sr_set_keypad_digits in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_sr_set_keypad_digits+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -29280,35 +28107,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_sr_set_keypad_digits ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_sr_set_keypad_digits ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_sr_set_keypad_digits=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_sr_set_keypad_digits=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_sr_set_keypad_digits" >&5
+$as_echo "$ac_cv_lib_pri_pri_sr_set_keypad_digits" >&6; }
+if test "x$ac_cv_lib_pri_pri_sr_set_keypad_digits" = xyes; then :
AST_PRI_SETUP_KEYPAD_FOUND=yes
else
AST_PRI_SETUP_KEYPAD_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_SETUP_KEYPAD_FOUND}" = "yes"; then
@@ -29318,9 +28144,8 @@ fi
PRI_SETUP_KEYPAD_INCLUDE="-I${PRI_SETUP_KEYPAD_DIR}/include"
fi
PRI_SETUP_KEYPAD_INCLUDE="${PRI_SETUP_KEYPAD_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_SETUP_KEYPAD_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_SETUP_KEYPAD_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -29332,14 +28157,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_SETUP_KEYPAD_HEADER_FOUND}" = "x0" ; then
PRI_SETUP_KEYPAD_LIB=""
PRI_SETUP_KEYPAD_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_SETUP_KEYPAD_LIB=""
- fi
+
PBX_PRI_SETUP_KEYPAD=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_SETUP_KEYPAD 1
@@ -29365,16 +28188,12 @@ if test "x${PBX_PRI_PROG_W_CAUSE}" != "x1" -a "${USE_PRI_PROG_W_CAUSE}" != "no";
pbxlibdir="-L${PRI_PROG_W_CAUSE_DIR}"
fi
fi
- pbxfuncname="pri_progress_with_cause"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_PROG_W_CAUSE_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_progress_with_cause in -lpri" >&5
+$as_echo_n "checking for pri_progress_with_cause in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_progress_with_cause+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -29388,35 +28207,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_progress_with_cause ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_progress_with_cause ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_progress_with_cause=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_progress_with_cause=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_progress_with_cause" >&5
+$as_echo "$ac_cv_lib_pri_pri_progress_with_cause" >&6; }
+if test "x$ac_cv_lib_pri_pri_progress_with_cause" = xyes; then :
AST_PRI_PROG_W_CAUSE_FOUND=yes
else
AST_PRI_PROG_W_CAUSE_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_PROG_W_CAUSE_FOUND}" = "yes"; then
@@ -29426,9 +28244,8 @@ fi
PRI_PROG_W_CAUSE_INCLUDE="-I${PRI_PROG_W_CAUSE_DIR}/include"
fi
PRI_PROG_W_CAUSE_INCLUDE="${PRI_PROG_W_CAUSE_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_PROG_W_CAUSE_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_PROG_W_CAUSE_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -29440,14 +28257,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_PROG_W_CAUSE_HEADER_FOUND}" = "x0" ; then
PRI_PROG_W_CAUSE_LIB=""
PRI_PROG_W_CAUSE_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_PROG_W_CAUSE_LIB=""
- fi
+
PBX_PRI_PROG_W_CAUSE=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_PROG_W_CAUSE 1
@@ -29469,16 +28284,12 @@ if test "x${PBX_PRI_INBANDDISCONNECT}" != "x1" -a "${USE_PRI_INBANDDISCONNECT}"
pbxlibdir="-L${PRI_INBANDDISCONNECT_DIR}"
fi
fi
- pbxfuncname="pri_set_inbanddisconnect"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_INBANDDISCONNECT_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_set_inbanddisconnect in -lpri" >&5
+$as_echo_n "checking for pri_set_inbanddisconnect in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_set_inbanddisconnect+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -29492,35 +28303,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_set_inbanddisconnect ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_set_inbanddisconnect ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_set_inbanddisconnect=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_set_inbanddisconnect=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_set_inbanddisconnect" >&5
+$as_echo "$ac_cv_lib_pri_pri_set_inbanddisconnect" >&6; }
+if test "x$ac_cv_lib_pri_pri_set_inbanddisconnect" = xyes; then :
AST_PRI_INBANDDISCONNECT_FOUND=yes
else
AST_PRI_INBANDDISCONNECT_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_INBANDDISCONNECT_FOUND}" = "yes"; then
@@ -29530,9 +28340,8 @@ fi
PRI_INBANDDISCONNECT_INCLUDE="-I${PRI_INBANDDISCONNECT_DIR}/include"
fi
PRI_INBANDDISCONNECT_INCLUDE="${PRI_INBANDDISCONNECT_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_INBANDDISCONNECT_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_INBANDDISCONNECT_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -29544,14 +28353,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_INBANDDISCONNECT_HEADER_FOUND}" = "x0" ; then
PRI_INBANDDISCONNECT_LIB=""
PRI_INBANDDISCONNECT_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_INBANDDISCONNECT_LIB=""
- fi
+
PBX_PRI_INBANDDISCONNECT=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_INBANDDISCONNECT 1
@@ -29573,16 +28380,12 @@ if test "x${PBX_PRI_SERVICE_MESSAGES}" != "x1" -a "${USE_PRI_SERVICE_MESSAGES}"
pbxlibdir="-L${PRI_SERVICE_MESSAGES_DIR}"
fi
fi
- pbxfuncname="pri_maintenance_service"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_SERVICE_MESSAGES_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_maintenance_service in -lpri" >&5
+$as_echo_n "checking for pri_maintenance_service in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_maintenance_service+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -29596,35 +28399,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_maintenance_service ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_maintenance_service ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_maintenance_service=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_maintenance_service=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_maintenance_service" >&5
+$as_echo "$ac_cv_lib_pri_pri_maintenance_service" >&6; }
+if test "x$ac_cv_lib_pri_pri_maintenance_service" = xyes; then :
AST_PRI_SERVICE_MESSAGES_FOUND=yes
else
AST_PRI_SERVICE_MESSAGES_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_SERVICE_MESSAGES_FOUND}" = "yes"; then
@@ -29634,9 +28436,8 @@ fi
PRI_SERVICE_MESSAGES_INCLUDE="-I${PRI_SERVICE_MESSAGES_DIR}/include"
fi
PRI_SERVICE_MESSAGES_INCLUDE="${PRI_SERVICE_MESSAGES_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_SERVICE_MESSAGES_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_SERVICE_MESSAGES_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -29648,14 +28449,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_SERVICE_MESSAGES_HEADER_FOUND}" = "x0" ; then
PRI_SERVICE_MESSAGES_LIB=""
PRI_SERVICE_MESSAGES_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_SERVICE_MESSAGES_LIB=""
- fi
+
PBX_PRI_SERVICE_MESSAGES=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_SERVICE_MESSAGES 1
@@ -29677,16 +28476,12 @@ if test "x${PBX_PRI_REVERSE_CHARGE}" != "x1" -a "${USE_PRI_REVERSE_CHARGE}" != "
pbxlibdir="-L${PRI_REVERSE_CHARGE_DIR}"
fi
fi
- pbxfuncname="pri_sr_set_reversecharge"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_REVERSE_CHARGE_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_sr_set_reversecharge in -lpri" >&5
+$as_echo_n "checking for pri_sr_set_reversecharge in -lpri... " >&6; }
+if ${ac_cv_lib_pri_pri_sr_set_reversecharge+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -29700,35 +28495,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char pri_sr_set_reversecharge ();
int
main ()
{
-return ${pbxfuncname} ();
+return pri_sr_set_reversecharge ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_pri_pri_sr_set_reversecharge=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_pri_pri_sr_set_reversecharge=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_sr_set_reversecharge" >&5
+$as_echo "$ac_cv_lib_pri_pri_sr_set_reversecharge" >&6; }
+if test "x$ac_cv_lib_pri_pri_sr_set_reversecharge" = xyes; then :
AST_PRI_REVERSE_CHARGE_FOUND=yes
else
AST_PRI_REVERSE_CHARGE_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_PRI_REVERSE_CHARGE_FOUND}" = "yes"; then
@@ -29738,9 +28532,8 @@ fi
PRI_REVERSE_CHARGE_INCLUDE="-I${PRI_REVERSE_CHARGE_DIR}/include"
fi
PRI_REVERSE_CHARGE_INCLUDE="${PRI_REVERSE_CHARGE_INCLUDE} "
- if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_REVERSE_CHARGE_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_REVERSE_CHARGE_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
@@ -29752,14 +28545,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${PRI_REVERSE_CHARGE_HEADER_FOUND}" = "x0" ; then
PRI_REVERSE_CHARGE_LIB=""
PRI_REVERSE_CHARGE_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_REVERSE_CHARGE_LIB=""
- fi
+
PBX_PRI_REVERSE_CHARGE=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_REVERSE_CHARGE 1
@@ -29783,16 +28574,12 @@ if test "x${PBX_RESAMPLE}" != "x1" -a "${USE_RESAMPLE}" != "no"; then
pbxlibdir="-L${RESAMPLE_DIR}"
fi
fi
- pbxfuncname="resample_open"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_RESAMPLE_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_resample_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lresample" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lresample... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resample_open in -lresample" >&5
+$as_echo_n "checking for resample_open in -lresample... " >&6; }
+if ${ac_cv_lib_resample_resample_open+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -29806,35 +28593,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char resample_open ();
int
main ()
{
-return ${pbxfuncname} ();
+return resample_open ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_resample_resample_open=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_resample_resample_open=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resample_resample_open" >&5
+$as_echo "$ac_cv_lib_resample_resample_open" >&6; }
+if test "x$ac_cv_lib_resample_resample_open" = xyes; then :
AST_RESAMPLE_FOUND=yes
else
AST_RESAMPLE_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_RESAMPLE_FOUND}" = "yes"; then
@@ -29844,9 +28630,8 @@ fi
RESAMPLE_INCLUDE="-I${RESAMPLE_DIR}/include"
fi
RESAMPLE_INCLUDE="${RESAMPLE_INCLUDE} "
- if test "xlibresample.h" = "x" ; then # no header, assume found
- RESAMPLE_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${RESAMPLE_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libresample.h" "ac_cv_header_libresample_h" "$ac_includes_default"
@@ -29858,14 +28643,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${RESAMPLE_HEADER_FOUND}" = "x0" ; then
RESAMPLE_LIB=""
RESAMPLE_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- RESAMPLE_LIB=""
- fi
+
PBX_RESAMPLE=1
cat >>confdefs.h <<_ACEOF
#define HAVE_RESAMPLE 1
@@ -29887,16 +28670,12 @@ if test "x${PBX_FFTW3}" != "x1" -a "${USE_FFTW3}" != "no"; then
pbxlibdir="-L${FFTW3_DIR}"
fi
fi
- pbxfuncname="fftw_alloc_real"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_FFTW3_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_fftw3_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lfftw3" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lfftw3... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_alloc_real in -lfftw3" >&5
+$as_echo_n "checking for fftw_alloc_real in -lfftw3... " >&6; }
+if ${ac_cv_lib_fftw3_fftw_alloc_real+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -29910,35 +28689,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char fftw_alloc_real ();
int
main ()
{
-return ${pbxfuncname} ();
+return fftw_alloc_real ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_fftw3_fftw_alloc_real=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_fftw3_fftw_alloc_real=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_alloc_real" >&5
+$as_echo "$ac_cv_lib_fftw3_fftw_alloc_real" >&6; }
+if test "x$ac_cv_lib_fftw3_fftw_alloc_real" = xyes; then :
AST_FFTW3_FOUND=yes
else
AST_FFTW3_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_FFTW3_FOUND}" = "yes"; then
@@ -29948,9 +28726,8 @@ fi
FFTW3_INCLUDE="-I${FFTW3_DIR}/include"
fi
FFTW3_INCLUDE="${FFTW3_INCLUDE} "
- if test "xfftw3.h" = "x" ; then # no header, assume found
- FFTW3_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${FFTW3_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "fftw3.h" "ac_cv_header_fftw3_h" "$ac_includes_default"
@@ -29962,14 +28739,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${FFTW3_HEADER_FOUND}" = "x0" ; then
FFTW3_LIB=""
FFTW3_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- FFTW3_LIB=""
- fi
+
PBX_FFTW3=1
cat >>confdefs.h <<_ACEOF
#define HAVE_FFTW3 1
@@ -29991,16 +28766,12 @@ if test "x${PBX_SNDFILE}" != "x1" -a "${USE_SNDFILE}" != "no"; then
pbxlibdir="-L${SNDFILE_DIR}"
fi
fi
- pbxfuncname="sf_open"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SNDFILE_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_sndfile_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsndfile" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lsndfile... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sf_open in -lsndfile" >&5
+$as_echo_n "checking for sf_open in -lsndfile... " >&6; }
+if ${ac_cv_lib_sndfile_sf_open+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30014,35 +28785,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char sf_open ();
int
main ()
{
-return ${pbxfuncname} ();
+return sf_open ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_sndfile_sf_open=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_sndfile_sf_open=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sndfile_sf_open" >&5
+$as_echo "$ac_cv_lib_sndfile_sf_open" >&6; }
+if test "x$ac_cv_lib_sndfile_sf_open" = xyes; then :
AST_SNDFILE_FOUND=yes
else
AST_SNDFILE_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SNDFILE_FOUND}" = "yes"; then
@@ -30052,9 +28822,8 @@ fi
SNDFILE_INCLUDE="-I${SNDFILE_DIR}/include"
fi
SNDFILE_INCLUDE="${SNDFILE_INCLUDE} "
- if test "xsndfile.h" = "x" ; then # no header, assume found
- SNDFILE_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SNDFILE_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "sndfile.h" "ac_cv_header_sndfile_h" "$ac_includes_default"
@@ -30066,14 +28835,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${SNDFILE_HEADER_FOUND}" = "x0" ; then
SNDFILE_LIB=""
SNDFILE_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SNDFILE_LIB=""
- fi
+
PBX_SNDFILE=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SNDFILE 1
@@ -30087,21 +28854,8 @@ fi
if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then
- if test "xminimum version of SpanDSP" != "x"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for minimum version of SpanDSP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for minimum version of SpanDSP" >&5
$as_echo_n "checking for minimum version of SpanDSP... " >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"
- #if SPANDSP_RELEASE_DATE < 20080516
- #error \"spandsp 0.0.5 or greater is required\"
- #endif
- \" compiles using spandsp/version.h" >&5
-$as_echo_n "checking if \"
- #if SPANDSP_RELEASE_DATE < 20080516
- #error \"spandsp 0.0.5 or greater is required\"
- #endif
- \" compiles using spandsp/version.h... " >&6; }
- fi
saved_cppflags="${CPPFLAGS}"
if test "x${SPANDSP_DIR}" != "x"; then
SPANDSP_INCLUDE="-I${SPANDSP_DIR}/include"
@@ -30158,16 +28912,12 @@ if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then
pbxlibdir="-L${SPANDSP_DIR}"
fi
fi
- pbxfuncname="span_set_message_handler"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SPANDSP_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_spandsp_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lspandsp" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lspandsp... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for span_set_message_handler in -lspandsp" >&5
+$as_echo_n "checking for span_set_message_handler in -lspandsp... " >&6; }
+if ${ac_cv_lib_spandsp_span_set_message_handler+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30181,35 +28931,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char span_set_message_handler ();
int
main ()
{
-return ${pbxfuncname} ();
+return span_set_message_handler ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_spandsp_span_set_message_handler=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_spandsp_span_set_message_handler=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spandsp_span_set_message_handler" >&5
+$as_echo "$ac_cv_lib_spandsp_span_set_message_handler" >&6; }
+if test "x$ac_cv_lib_spandsp_span_set_message_handler" = xyes; then :
AST_SPANDSP_FOUND=yes
else
AST_SPANDSP_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SPANDSP_FOUND}" = "yes"; then
@@ -30219,9 +28968,8 @@ fi
SPANDSP_INCLUDE="-I${SPANDSP_DIR}/include"
fi
SPANDSP_INCLUDE="${SPANDSP_INCLUDE} "
- if test "xspandsp.h" = "x" ; then # no header, assume found
- SPANDSP_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "spandsp.h" "ac_cv_header_spandsp_h" "$ac_includes_default"
@@ -30233,14 +28981,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${SPANDSP_HEADER_FOUND}" = "x0" ; then
SPANDSP_LIB=""
SPANDSP_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SPANDSP_LIB=""
- fi
+
PBX_SPANDSP=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SPANDSP 1
@@ -30267,16 +29013,12 @@ if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then
pbxlibdir="-L${SPANDSP_DIR}"
fi
fi
- pbxfuncname="t38_terminal_init"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SPANDSP_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_spandsp_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lspandsp" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lspandsp... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for t38_terminal_init in -lspandsp" >&5
+$as_echo_n "checking for t38_terminal_init in -lspandsp... " >&6; }
+if ${ac_cv_lib_spandsp_t38_terminal_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30290,35 +29032,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char t38_terminal_init ();
int
main ()
{
-return ${pbxfuncname} ();
+return t38_terminal_init ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_spandsp_t38_terminal_init=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_spandsp_t38_terminal_init=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spandsp_t38_terminal_init" >&5
+$as_echo "$ac_cv_lib_spandsp_t38_terminal_init" >&6; }
+if test "x$ac_cv_lib_spandsp_t38_terminal_init" = xyes; then :
AST_SPANDSP_FOUND=yes
else
AST_SPANDSP_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SPANDSP_FOUND}" = "yes"; then
@@ -30328,9 +29069,8 @@ fi
SPANDSP_INCLUDE="-I${SPANDSP_DIR}/include"
fi
SPANDSP_INCLUDE="${SPANDSP_INCLUDE} "
- if test "xspandsp.h" = "x" ; then # no header, assume found
- SPANDSP_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "spandsp.h" "ac_cv_header_spandsp_h" "$ac_includes_default"
@@ -30342,14 +29082,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${SPANDSP_HEADER_FOUND}" = "x0" ; then
SPANDSP_LIB=""
SPANDSP_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SPANDSP_LIB=""
- fi
+
PBX_SPANDSP=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SPANDSP 1
@@ -30374,16 +29112,12 @@ if test "x${PBX_SS7}" != "x1" -a "${USE_SS7}" != "no"; then
pbxlibdir="-L${SS7_DIR}"
fi
fi
- pbxfuncname="ss7_set_isup_timer"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SS7_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_ss7_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lss7" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lss7... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ss7_set_isup_timer in -lss7" >&5
+$as_echo_n "checking for ss7_set_isup_timer in -lss7... " >&6; }
+if ${ac_cv_lib_ss7_ss7_set_isup_timer+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30397,35 +29131,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char ss7_set_isup_timer ();
int
main ()
{
-return ${pbxfuncname} ();
+return ss7_set_isup_timer ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_ss7_ss7_set_isup_timer=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_ss7_ss7_set_isup_timer=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ss7_ss7_set_isup_timer" >&5
+$as_echo "$ac_cv_lib_ss7_ss7_set_isup_timer" >&6; }
+if test "x$ac_cv_lib_ss7_ss7_set_isup_timer" = xyes; then :
AST_SS7_FOUND=yes
else
AST_SS7_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SS7_FOUND}" = "yes"; then
@@ -30435,9 +29168,8 @@ fi
SS7_INCLUDE="-I${SS7_DIR}/include"
fi
SS7_INCLUDE="${SS7_INCLUDE} "
- if test "xlibss7.h" = "x" ; then # no header, assume found
- SS7_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SS7_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "libss7.h" "ac_cv_header_libss7_h" "$ac_includes_default"
@@ -30449,14 +29181,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${SS7_HEADER_FOUND}" = "x0" ; then
SS7_LIB=""
SS7_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SS7_LIB=""
- fi
+
PBX_SS7=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SS7 1
@@ -30479,16 +29209,12 @@ if test "x${PBX_OPENR2}" != "x1" -a "${USE_OPENR2}" != "no"; then
pbxlibdir="-L${OPENR2_DIR}"
fi
fi
- pbxfuncname="openr2_chan_new"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_OPENR2_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_openr2_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lopenr2" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lopenr2... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openr2_chan_new in -lopenr2" >&5
+$as_echo_n "checking for openr2_chan_new in -lopenr2... " >&6; }
+if ${ac_cv_lib_openr2_openr2_chan_new+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30502,35 +29228,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char openr2_chan_new ();
int
main ()
{
-return ${pbxfuncname} ();
+return openr2_chan_new ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_openr2_openr2_chan_new=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_openr2_openr2_chan_new=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openr2_openr2_chan_new" >&5
+$as_echo "$ac_cv_lib_openr2_openr2_chan_new" >&6; }
+if test "x$ac_cv_lib_openr2_openr2_chan_new" = xyes; then :
AST_OPENR2_FOUND=yes
else
AST_OPENR2_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_OPENR2_FOUND}" = "yes"; then
@@ -30540,9 +29265,8 @@ fi
OPENR2_INCLUDE="-I${OPENR2_DIR}/include"
fi
OPENR2_INCLUDE="${OPENR2_INCLUDE} "
- if test "xopenr2.h" = "x" ; then # no header, assume found
- OPENR2_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${OPENR2_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "openr2.h" "ac_cv_header_openr2_h" "$ac_includes_default"
@@ -30554,14 +29278,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${OPENR2_HEADER_FOUND}" = "x0" ; then
OPENR2_LIB=""
OPENR2_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- OPENR2_LIB=""
- fi
+
PBX_OPENR2=1
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENR2 1
@@ -30584,16 +29306,12 @@ if test "x${PBX_OPUS}" != "x1" -a "${USE_OPUS}" != "no"; then
pbxlibdir="-L${OPUS_DIR}"
fi
fi
- pbxfuncname="opus_encoder_create"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_OPUS_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_opus_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lopus" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lopus... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opus_encoder_create in -lopus" >&5
+$as_echo_n "checking for opus_encoder_create in -lopus... " >&6; }
+if ${ac_cv_lib_opus_opus_encoder_create+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30607,35 +29325,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char opus_encoder_create ();
int
main ()
{
-return ${pbxfuncname} ();
+return opus_encoder_create ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_opus_opus_encoder_create=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_opus_opus_encoder_create=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opus_opus_encoder_create" >&5
+$as_echo "$ac_cv_lib_opus_opus_encoder_create" >&6; }
+if test "x$ac_cv_lib_opus_opus_encoder_create" = xyes; then :
AST_OPUS_FOUND=yes
else
AST_OPUS_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_OPUS_FOUND}" = "yes"; then
@@ -30645,9 +29362,8 @@ fi
OPUS_INCLUDE="-I${OPUS_DIR}/include"
fi
OPUS_INCLUDE="${OPUS_INCLUDE} "
- if test "xopus/opus.h" = "x" ; then # no header, assume found
- OPUS_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${OPUS_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "opus/opus.h" "ac_cv_header_opus_opus_h" "$ac_includes_default"
@@ -30659,14 +29375,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${OPUS_HEADER_FOUND}" = "x0" ; then
OPUS_LIB=""
OPUS_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- OPUS_LIB=""
- fi
+
PBX_OPUS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_OPUS 1
@@ -30694,16 +29408,12 @@ if test "x${PBX_OPUSFILE}" != "x1" -a "${USE_OPUSFILE}" != "no"; then
pbxlibdir="-L${OPUSFILE_DIR}"
fi
fi
- pbxfuncname="op_open_callbacks"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_OPUSFILE_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} $__opus_include"
- as_ac_Lib=`$as_echo "ac_cv_lib_opusfile_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lopusfile" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lopusfile... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for op_open_callbacks in -lopusfile" >&5
+$as_echo_n "checking for op_open_callbacks in -lopusfile... " >&6; }
+if ${ac_cv_lib_opusfile_op_open_callbacks+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30717,35 +29427,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char op_open_callbacks ();
int
main ()
{
-return ${pbxfuncname} ();
+return op_open_callbacks ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_opusfile_op_open_callbacks=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_opusfile_op_open_callbacks=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opusfile_op_open_callbacks" >&5
+$as_echo "$ac_cv_lib_opusfile_op_open_callbacks" >&6; }
+if test "x$ac_cv_lib_opusfile_op_open_callbacks" = xyes; then :
AST_OPUSFILE_FOUND=yes
else
AST_OPUSFILE_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_OPUSFILE_FOUND}" = "yes"; then
@@ -30755,9 +29464,8 @@ fi
OPUSFILE_INCLUDE="-I${OPUSFILE_DIR}/include"
fi
OPUSFILE_INCLUDE="${OPUSFILE_INCLUDE} $__opus_include"
- if test "xopus/opusfile.h" = "x" ; then # no header, assume found
- OPUSFILE_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${OPUSFILE_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "opus/opusfile.h" "ac_cv_header_opus_opusfile_h" "$ac_includes_default"
@@ -30769,14 +29477,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${OPUSFILE_HEADER_FOUND}" = "x0" ; then
OPUSFILE_LIB=""
OPUSFILE_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- OPUSFILE_LIB=""
- fi
+
PBX_OPUSFILE=1
cat >>confdefs.h <<_ACEOF
#define HAVE_OPUSFILE 1
@@ -31017,11 +29723,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test "xP[WT]LIB_VERSION" != "x"; then
- VNAME="P[WT]LIB_VERSION"
- else
- VNAME="PWLIB_VERSION"
- fi
+ VNAME="P[WT]LIB_VERSION"
if test "${HAS_PWLIB:-unset}" != "unset"; then
PWLIB_VERSION=`grep "$VNAME \"" ${PWLIB_INCDIR}/ptbuildopts.h | sed -e 's/[[:space:]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'`
@@ -31030,11 +29732,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
PWLIB_BUILD_NUMBER=`echo ${PWLIB_VERSION} | cut -f3 -d.`
PWLIB_VER=$((${PWLIB_MAJOR_VERSION}*10000+${PWLIB_MINOR_VERSION}*100+${PWLIB_BUILD_NUMBER}))
PWLIB_REQ=$((1*10000+9*100+2))
- if test "x" = "x"; then
- PWLIB_MAX=9999999
- else
- PWLIB_MAX=$((*10000+*100+))
- fi
+ PWLIB_MAX=9999999
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323" >&5
$as_echo_n "checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323... " >&6; }
@@ -31350,11 +30048,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test "x" != "x"; then
- VNAME=""
- else
- VNAME="OPENH323_VERSION"
- fi
+ VNAME="OPENH323_VERSION"
if test "${HAS_OPENH323:-unset}" != "unset"; then
OPENH323_VERSION=`grep "$VNAME \"" ${OPENH323_INCDIR}/openh323buildopts.h | sed -e 's/[[:space:]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'`
@@ -31363,11 +30057,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
OPENH323_BUILD_NUMBER=`echo ${OPENH323_VERSION} | cut -f3 -d.`
OPENH323_VER=$((${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER}))
OPENH323_REQ=$((1*10000+17*100+3))
- if test "x0" = "x"; then
- OPENH323_MAX=9999999
- else
- OPENH323_MAX=$((1*10000+19*100+0))
- fi
+ OPENH323_MAX=$((1*10000+19*100+0))
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323" >&5
$as_echo_n "checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323... " >&6; }
@@ -31539,16 +30229,12 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
pbxlibdir="-L${LUA_DIR}"
fi
fi
- pbxfuncname="luaL_newstate"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_LUA_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.2" >&5
-$as_echo_n "checking for ${pbxfuncname} in -llua5.2... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2" >&5
+$as_echo_n "checking for luaL_newstate in -llua5.2... " >&6; }
+if ${ac_cv_lib_lua5_2_luaL_newstate+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -31562,35 +30248,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char luaL_newstate ();
int
main ()
{
-return ${pbxfuncname} ();
+return luaL_newstate ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_lua5_2_luaL_newstate=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_lua5_2_luaL_newstate=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua5_2_luaL_newstate" >&5
+$as_echo "$ac_cv_lib_lua5_2_luaL_newstate" >&6; }
+if test "x$ac_cv_lib_lua5_2_luaL_newstate" = xyes; then :
AST_LUA_FOUND=yes
else
AST_LUA_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
@@ -31600,9 +30285,8 @@ fi
LUA_INCLUDE="-I${LUA_DIR}/include"
fi
LUA_INCLUDE="${LUA_INCLUDE} "
- if test "xlua5.2/lua.h" = "x" ; then # no header, assume found
- LUA_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "lua5.2/lua.h" "ac_cv_header_lua5_2_lua_h" "$ac_includes_default"
@@ -31614,14 +30298,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${LUA_HEADER_FOUND}" = "x0" ; then
LUA_LIB=""
LUA_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- LUA_LIB=""
- fi
+
PBX_LUA=1
cat >>confdefs.h <<_ACEOF
#define HAVE_LUA 1
@@ -31651,16 +30333,12 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
pbxlibdir="-L${LUA_DIR}"
fi
fi
- pbxfuncname="luaL_newstate"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_LUA_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.1" >&5
-$as_echo_n "checking for ${pbxfuncname} in -llua5.1... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1" >&5
+$as_echo_n "checking for luaL_newstate in -llua5.1... " >&6; }
+if ${ac_cv_lib_lua5_1_luaL_newstate+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -31674,35 +30352,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char luaL_newstate ();
int
main ()
{
-return ${pbxfuncname} ();
+return luaL_newstate ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_lua5_1_luaL_newstate=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_lua5_1_luaL_newstate=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua5_1_luaL_newstate" >&5
+$as_echo "$ac_cv_lib_lua5_1_luaL_newstate" >&6; }
+if test "x$ac_cv_lib_lua5_1_luaL_newstate" = xyes; then :
AST_LUA_FOUND=yes
else
AST_LUA_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
@@ -31712,9 +30389,8 @@ fi
LUA_INCLUDE="-I${LUA_DIR}/include"
fi
LUA_INCLUDE="${LUA_INCLUDE} "
- if test "xlua5.1/lua.h" = "x" ; then # no header, assume found
- LUA_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "lua5.1/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default"
@@ -31726,14 +30402,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${LUA_HEADER_FOUND}" = "x0" ; then
LUA_LIB=""
LUA_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- LUA_LIB=""
- fi
+
PBX_LUA=1
cat >>confdefs.h <<_ACEOF
#define HAVE_LUA 1
@@ -31764,16 +30438,12 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
pbxlibdir="-L${LUA_DIR}"
fi
fi
- pbxfuncname="luaL_openlib"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_LUA_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_lua_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua" >&5
-$as_echo_n "checking for ${pbxfuncname} in -llua... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_openlib in -llua" >&5
+$as_echo_n "checking for luaL_openlib in -llua... " >&6; }
+if ${ac_cv_lib_lua_luaL_openlib+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -31787,35 +30457,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char luaL_openlib ();
int
main ()
{
-return ${pbxfuncname} ();
+return luaL_openlib ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_lua_luaL_openlib=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_lua_luaL_openlib=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_luaL_openlib" >&5
+$as_echo "$ac_cv_lib_lua_luaL_openlib" >&6; }
+if test "x$ac_cv_lib_lua_luaL_openlib" = xyes; then :
AST_LUA_FOUND=yes
else
AST_LUA_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
@@ -31825,9 +30494,8 @@ fi
LUA_INCLUDE="-I${LUA_DIR}/include"
fi
LUA_INCLUDE="${LUA_INCLUDE} "
- if test "xlua.h" = "x" ; then # no header, assume found
- LUA_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "lua.h" "ac_cv_header_lua_h" "$ac_includes_default"
@@ -31839,14 +30507,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${LUA_HEADER_FOUND}" = "x0" ; then
LUA_LIB=""
LUA_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- LUA_LIB=""
- fi
+
PBX_LUA=1
cat >>confdefs.h <<_ACEOF
#define HAVE_LUA 1
@@ -31871,16 +30537,12 @@ if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then
pbxlibdir="-L${RADIUS_DIR}"
fi
fi
- pbxfuncname="rc_read_config"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_RADIUS_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_freeradius-client_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lfreeradius-client" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lfreeradius-client... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lfreeradius-client" >&5
+$as_echo_n "checking for rc_read_config in -lfreeradius-client... " >&6; }
+if ${ac_cv_lib_freeradius_client_rc_read_config+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -31894,35 +30556,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char rc_read_config ();
int
main ()
{
-return ${pbxfuncname} ();
+return rc_read_config ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_freeradius_client_rc_read_config=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_freeradius_client_rc_read_config=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freeradius_client_rc_read_config" >&5
+$as_echo "$ac_cv_lib_freeradius_client_rc_read_config" >&6; }
+if test "x$ac_cv_lib_freeradius_client_rc_read_config" = xyes; then :
AST_RADIUS_FOUND=yes
else
AST_RADIUS_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_RADIUS_FOUND}" = "yes"; then
@@ -31932,9 +30593,8 @@ fi
RADIUS_INCLUDE="-I${RADIUS_DIR}/include"
fi
RADIUS_INCLUDE="${RADIUS_INCLUDE} "
- if test "xfreeradius-client.h" = "x" ; then # no header, assume found
- RADIUS_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "freeradius-client.h" "ac_cv_header_freeradius_client_h" "$ac_includes_default"
@@ -31946,14 +30606,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then
RADIUS_LIB=""
RADIUS_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- RADIUS_LIB=""
- fi
+
PBX_RADIUS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_RADIUS 1
@@ -31980,16 +30638,12 @@ if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then
pbxlibdir="-L${RADIUS_DIR}"
fi
fi
- pbxfuncname="rc_read_config"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_RADIUS_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_radiusclient-ng_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lradiusclient-ng" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lradiusclient-ng... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradiusclient-ng" >&5
+$as_echo_n "checking for rc_read_config in -lradiusclient-ng... " >&6; }
+if ${ac_cv_lib_radiusclient_ng_rc_read_config+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -32003,35 +30657,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char rc_read_config ();
int
main ()
{
-return ${pbxfuncname} ();
+return rc_read_config ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_radiusclient_ng_rc_read_config=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_radiusclient_ng_rc_read_config=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radiusclient_ng_rc_read_config" >&5
+$as_echo "$ac_cv_lib_radiusclient_ng_rc_read_config" >&6; }
+if test "x$ac_cv_lib_radiusclient_ng_rc_read_config" = xyes; then :
AST_RADIUS_FOUND=yes
else
AST_RADIUS_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_RADIUS_FOUND}" = "yes"; then
@@ -32041,9 +30694,8 @@ fi
RADIUS_INCLUDE="-I${RADIUS_DIR}/include"
fi
RADIUS_INCLUDE="${RADIUS_INCLUDE} "
- if test "xradiusclient-ng.h" = "x" ; then # no header, assume found
- RADIUS_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "radiusclient-ng.h" "ac_cv_header_radiusclient_ng_h" "$ac_includes_default"
@@ -32055,14 +30707,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then
RADIUS_LIB=""
RADIUS_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- RADIUS_LIB=""
- fi
+
PBX_RADIUS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_RADIUS 1
@@ -32089,16 +30739,12 @@ if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then
pbxlibdir="-L${RADIUS_DIR}"
fi
fi
- pbxfuncname="rc_read_config"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_RADIUS_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_radcli_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lradcli" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lradcli... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradcli" >&5
+$as_echo_n "checking for rc_read_config in -lradcli... " >&6; }
+if ${ac_cv_lib_radcli_rc_read_config+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -32112,35 +30758,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char rc_read_config ();
int
main ()
{
-return ${pbxfuncname} ();
+return rc_read_config ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_radcli_rc_read_config=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_radcli_rc_read_config=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radcli_rc_read_config" >&5
+$as_echo "$ac_cv_lib_radcli_rc_read_config" >&6; }
+if test "x$ac_cv_lib_radcli_rc_read_config" = xyes; then :
AST_RADIUS_FOUND=yes
else
AST_RADIUS_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_RADIUS_FOUND}" = "yes"; then
@@ -32150,9 +30795,8 @@ fi
RADIUS_INCLUDE="-I${RADIUS_DIR}/include"
fi
RADIUS_INCLUDE="${RADIUS_INCLUDE} "
- if test "xradcli/radcli.h" = "x" ; then # no header, assume found
- RADIUS_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "radcli/radcli.h" "ac_cv_header_radcli_radcli_h" "$ac_includes_default"
@@ -32164,14 +30808,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then
RADIUS_LIB=""
RADIUS_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- RADIUS_LIB=""
- fi
+
PBX_RADIUS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_RADIUS 1
@@ -32201,16 +30843,12 @@ if test "x${PBX_CODEC2}" != "x1" -a "${USE_CODEC2}" != "no"; then
pbxlibdir="-L${CODEC2_DIR}"
fi
fi
- pbxfuncname="codec2_create"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_CODEC2_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_codec2_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcodec2" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lcodec2... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for codec2_create in -lcodec2" >&5
+$as_echo_n "checking for codec2_create in -lcodec2... " >&6; }
+if ${ac_cv_lib_codec2_codec2_create+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -32224,35 +30862,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char codec2_create ();
int
main ()
{
-return ${pbxfuncname} ();
+return codec2_create ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_codec2_codec2_create=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_codec2_codec2_create=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_codec2_codec2_create" >&5
+$as_echo "$ac_cv_lib_codec2_codec2_create" >&6; }
+if test "x$ac_cv_lib_codec2_codec2_create" = xyes; then :
AST_CODEC2_FOUND=yes
else
AST_CODEC2_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_CODEC2_FOUND}" = "yes"; then
@@ -32262,9 +30899,8 @@ fi
CODEC2_INCLUDE="-I${CODEC2_DIR}/include"
fi
CODEC2_INCLUDE="${CODEC2_INCLUDE} "
- if test "xcodec2/codec2.h" = "x" ; then # no header, assume found
- CODEC2_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${CODEC2_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "codec2/codec2.h" "ac_cv_header_codec2_codec2_h" "$ac_includes_default"
@@ -32276,14 +30912,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${CODEC2_HEADER_FOUND}" = "x0" ; then
CODEC2_LIB=""
CODEC2_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- CODEC2_LIB=""
- fi
+
PBX_CODEC2=1
cat >>confdefs.h <<_ACEOF
#define HAVE_CODEC2 1
@@ -32306,16 +30940,12 @@ if test "x${PBX_COROSYNC}" != "x1" -a "${USE_COROSYNC}" != "no"; then
pbxlibdir="-L${COROSYNC_DIR}"
fi
fi
- pbxfuncname="cpg_join"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_COROSYNC_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_cpg_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcpg" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lcpg... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cpg_join in -lcpg" >&5
+$as_echo_n "checking for cpg_join in -lcpg... " >&6; }
+if ${ac_cv_lib_cpg_cpg_join+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -32329,35 +30959,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char cpg_join ();
int
main ()
{
-return ${pbxfuncname} ();
+return cpg_join ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_cpg_cpg_join=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_cpg_cpg_join=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cpg_cpg_join" >&5
+$as_echo "$ac_cv_lib_cpg_cpg_join" >&6; }
+if test "x$ac_cv_lib_cpg_cpg_join" = xyes; then :
AST_COROSYNC_FOUND=yes
else
AST_COROSYNC_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_COROSYNC_FOUND}" = "yes"; then
@@ -32367,9 +30996,8 @@ fi
COROSYNC_INCLUDE="-I${COROSYNC_DIR}/include"
fi
COROSYNC_INCLUDE="${COROSYNC_INCLUDE} "
- if test "xcorosync/cpg.h" = "x" ; then # no header, assume found
- COROSYNC_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${COROSYNC_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "corosync/cpg.h" "ac_cv_header_corosync_cpg_h" "$ac_includes_default"
@@ -32381,14 +31009,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${COROSYNC_HEADER_FOUND}" = "x0" ; then
COROSYNC_LIB=""
COROSYNC_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- COROSYNC_LIB=""
- fi
+
PBX_COROSYNC=1
cat >>confdefs.h <<_ACEOF
#define HAVE_COROSYNC 1
@@ -32410,16 +31036,12 @@ if test "x${PBX_COROSYNC_CFG_STATE_TRACK}" != "x1" -a "${USE_COROSYNC_CFG_STATE_
pbxlibdir="-L${COROSYNC_CFG_STATE_TRACK_DIR}"
fi
fi
- pbxfuncname="corosync_cfg_state_track"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_COROSYNC_CFG_STATE_TRACK_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_cfg_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcfg" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lcfg... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for corosync_cfg_state_track in -lcfg" >&5
+$as_echo_n "checking for corosync_cfg_state_track in -lcfg... " >&6; }
+if ${ac_cv_lib_cfg_corosync_cfg_state_track+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -32433,35 +31055,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char corosync_cfg_state_track ();
int
main ()
{
-return ${pbxfuncname} ();
+return corosync_cfg_state_track ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_cfg_corosync_cfg_state_track=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_cfg_corosync_cfg_state_track=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cfg_corosync_cfg_state_track" >&5
+$as_echo "$ac_cv_lib_cfg_corosync_cfg_state_track" >&6; }
+if test "x$ac_cv_lib_cfg_corosync_cfg_state_track" = xyes; then :
AST_COROSYNC_CFG_STATE_TRACK_FOUND=yes
else
AST_COROSYNC_CFG_STATE_TRACK_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_COROSYNC_CFG_STATE_TRACK_FOUND}" = "yes"; then
@@ -32471,9 +31092,8 @@ fi
COROSYNC_CFG_STATE_TRACK_INCLUDE="-I${COROSYNC_CFG_STATE_TRACK_DIR}/include"
fi
COROSYNC_CFG_STATE_TRACK_INCLUDE="${COROSYNC_CFG_STATE_TRACK_INCLUDE} "
- if test "xcorosync/cfg.h" = "x" ; then # no header, assume found
- COROSYNC_CFG_STATE_TRACK_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${COROSYNC_CFG_STATE_TRACK_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "corosync/cfg.h" "ac_cv_header_corosync_cfg_h" "$ac_includes_default"
@@ -32485,14 +31105,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${COROSYNC_CFG_STATE_TRACK_HEADER_FOUND}" = "x0" ; then
COROSYNC_CFG_STATE_TRACK_LIB=""
COROSYNC_CFG_STATE_TRACK_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- COROSYNC_CFG_STATE_TRACK_LIB=""
- fi
+
PBX_COROSYNC_CFG_STATE_TRACK=1
cat >>confdefs.h <<_ACEOF
#define HAVE_COROSYNC_CFG_STATE_TRACK 1
@@ -32515,16 +31133,12 @@ if test "x${PBX_SPEEX}" != "x1" -a "${USE_SPEEX}" != "no"; then
pbxlibdir="-L${SPEEX_DIR}"
fi
fi
- pbxfuncname="speex_encode"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SPEEX_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_speex_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lspeex" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lspeex... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for speex_encode in -lspeex" >&5
+$as_echo_n "checking for speex_encode in -lspeex... " >&6; }
+if ${ac_cv_lib_speex_speex_encode+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -32538,35 +31152,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char speex_encode ();
int
main ()
{
-return ${pbxfuncname} ();
+return speex_encode ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_speex_speex_encode=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_speex_speex_encode=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_speex_speex_encode" >&5
+$as_echo "$ac_cv_lib_speex_speex_encode" >&6; }
+if test "x$ac_cv_lib_speex_speex_encode" = xyes; then :
AST_SPEEX_FOUND=yes
else
AST_SPEEX_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SPEEX_FOUND}" = "yes"; then
@@ -32576,9 +31189,8 @@ fi
SPEEX_INCLUDE="-I${SPEEX_DIR}/include"
fi
SPEEX_INCLUDE="${SPEEX_INCLUDE} "
- if test "xspeex/speex.h" = "x" ; then # no header, assume found
- SPEEX_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SPEEX_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "speex/speex.h" "ac_cv_header_speex_speex_h" "$ac_includes_default"
@@ -32590,14 +31202,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${SPEEX_HEADER_FOUND}" = "x0" ; then
SPEEX_LIB=""
SPEEX_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SPEEX_LIB=""
- fi
+
PBX_SPEEX=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SPEEX 1
@@ -32621,16 +31231,12 @@ if test "x${PBX_SPEEX_PREPROCESS}" != "x1" -a "${USE_SPEEX_PREPROCESS}" != "no";
pbxlibdir="-L${SPEEX_PREPROCESS_DIR}"
fi
fi
- pbxfuncname="speex_preprocess_ctl"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SPEEX_PREPROCESS_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_speex_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lspeex" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lspeex... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for speex_preprocess_ctl in -lspeex" >&5
+$as_echo_n "checking for speex_preprocess_ctl in -lspeex... " >&6; }
+if ${ac_cv_lib_speex_speex_preprocess_ctl+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -32644,35 +31250,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char speex_preprocess_ctl ();
int
main ()
{
-return ${pbxfuncname} ();
+return speex_preprocess_ctl ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_speex_speex_preprocess_ctl=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_speex_speex_preprocess_ctl=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_speex_speex_preprocess_ctl" >&5
+$as_echo "$ac_cv_lib_speex_speex_preprocess_ctl" >&6; }
+if test "x$ac_cv_lib_speex_speex_preprocess_ctl" = xyes; then :
AST_SPEEX_PREPROCESS_FOUND=yes
else
AST_SPEEX_PREPROCESS_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SPEEX_PREPROCESS_FOUND}" = "yes"; then
@@ -32682,9 +31287,8 @@ fi
SPEEX_PREPROCESS_INCLUDE="-I${SPEEX_PREPROCESS_DIR}/include"
fi
SPEEX_PREPROCESS_INCLUDE="${SPEEX_PREPROCESS_INCLUDE} "
- if test "xspeex/speex.h" = "x" ; then # no header, assume found
- SPEEX_PREPROCESS_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SPEEX_PREPROCESS_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "speex/speex.h" "ac_cv_header_speex_speex_h" "$ac_includes_default"
@@ -32696,14 +31300,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${SPEEX_PREPROCESS_HEADER_FOUND}" = "x0" ; then
SPEEX_PREPROCESS_LIB=""
SPEEX_PREPROCESS_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SPEEX_PREPROCESS_LIB=""
- fi
+
PBX_SPEEX_PREPROCESS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SPEEX_PREPROCESS 1
@@ -32729,16 +31331,12 @@ if test "x${PBX_SPEEXDSP}" != "x1" -a "${USE_SPEEXDSP}" != "no"; then
pbxlibdir="-L${SPEEXDSP_DIR}"
fi
fi
- pbxfuncname="speex_preprocess_ctl"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SPEEXDSP_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_speexdsp_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lspeexdsp" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lspeexdsp... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for speex_preprocess_ctl in -lspeexdsp" >&5
+$as_echo_n "checking for speex_preprocess_ctl in -lspeexdsp... " >&6; }
+if ${ac_cv_lib_speexdsp_speex_preprocess_ctl+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -32752,35 +31350,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char speex_preprocess_ctl ();
int
main ()
{
-return ${pbxfuncname} ();
+return speex_preprocess_ctl ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_speexdsp_speex_preprocess_ctl=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_speexdsp_speex_preprocess_ctl=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_speexdsp_speex_preprocess_ctl" >&5
+$as_echo "$ac_cv_lib_speexdsp_speex_preprocess_ctl" >&6; }
+if test "x$ac_cv_lib_speexdsp_speex_preprocess_ctl" = xyes; then :
AST_SPEEXDSP_FOUND=yes
else
AST_SPEEXDSP_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SPEEXDSP_FOUND}" = "yes"; then
@@ -32790,9 +31387,8 @@ fi
SPEEXDSP_INCLUDE="-I${SPEEXDSP_DIR}/include"
fi
SPEEXDSP_INCLUDE="${SPEEXDSP_INCLUDE} "
- if test "xspeex/speex.h" = "x" ; then # no header, assume found
- SPEEXDSP_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SPEEXDSP_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "speex/speex.h" "ac_cv_header_speex_speex_h" "$ac_includes_default"
@@ -32804,14 +31400,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${SPEEXDSP_HEADER_FOUND}" = "x0" ; then
SPEEXDSP_LIB=""
SPEEXDSP_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SPEEXDSP_LIB=""
- fi
+
PBX_SPEEXDSP=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SPEEXDSP 1
@@ -32839,16 +31433,12 @@ if test "x${PBX_SQLITE}" != "x1" -a "${USE_SQLITE}" != "no"; then
pbxlibdir="-L${SQLITE_DIR}"
fi
fi
- pbxfuncname="sqlite_exec"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SQLITE_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_sqlite_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsqlite" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lsqlite... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite_exec in -lsqlite" >&5
+$as_echo_n "checking for sqlite_exec in -lsqlite... " >&6; }
+if ${ac_cv_lib_sqlite_sqlite_exec+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -32862,35 +31452,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char sqlite_exec ();
int
main ()
{
-return ${pbxfuncname} ();
+return sqlite_exec ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_sqlite_sqlite_exec=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_sqlite_sqlite_exec=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_exec" >&5
+$as_echo "$ac_cv_lib_sqlite_sqlite_exec" >&6; }
+if test "x$ac_cv_lib_sqlite_sqlite_exec" = xyes; then :
AST_SQLITE_FOUND=yes
else
AST_SQLITE_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SQLITE_FOUND}" = "yes"; then
@@ -32900,9 +31489,8 @@ fi
SQLITE_INCLUDE="-I${SQLITE_DIR}/include"
fi
SQLITE_INCLUDE="${SQLITE_INCLUDE} "
- if test "xsqlite.h" = "x" ; then # no header, assume found
- SQLITE_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SQLITE_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "sqlite.h" "ac_cv_header_sqlite_h" "$ac_includes_default"
@@ -32914,14 +31502,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${SQLITE_HEADER_FOUND}" = "x0" ; then
SQLITE_LIB=""
SQLITE_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SQLITE_LIB=""
- fi
+
PBX_SQLITE=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SQLITE 1
@@ -32944,16 +31530,12 @@ if test "x${PBX_SQLITE3}" != "x1" -a "${USE_SQLITE3}" != "no"; then
pbxlibdir="-L${SQLITE3_DIR}"
fi
fi
- pbxfuncname="sqlite3_open"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SQLITE3_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
- as_ac_Lib=`$as_echo "ac_cv_lib_sqlite3_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsqlite3" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lsqlite3... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; }
+if ${ac_cv_lib_sqlite3_sqlite3_open+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -32967,35 +31549,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char sqlite3_open ();
int
main ()
{
-return ${pbxfuncname} ();
+return sqlite3_open ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_sqlite3_sqlite3_open=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_sqlite3_sqlite3_open=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes; then :
AST_SQLITE3_FOUND=yes
else
AST_SQLITE3_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SQLITE3_FOUND}" = "yes"; then
@@ -33005,9 +31586,8 @@ fi
SQLITE3_INCLUDE="-I${SQLITE3_DIR}/include"
fi
SQLITE3_INCLUDE="${SQLITE3_INCLUDE} ${PTHREAD_CFLAGS}"
- if test "xsqlite3.h" = "x" ; then # no header, assume found
- SQLITE3_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SQLITE3_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
@@ -33019,14 +31599,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${SQLITE3_HEADER_FOUND}" = "x0" ; then
SQLITE3_LIB=""
SQLITE3_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SQLITE3_LIB=""
- fi
+
PBX_SQLITE3=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SQLITE3 1
@@ -33058,16 +31636,12 @@ if test "x${PBX_LIBCRYPT}" != "x1" -a "${USE_LIBCRYPT}" != "no"; then
pbxlibdir="-L${LIBCRYPT_DIR}"
fi
fi
- pbxfuncname="crypt"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_LIBCRYPT_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_crypt_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcrypt" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lcrypt... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+$as_echo_n "checking for crypt in -lcrypt... " >&6; }
+if ${ac_cv_lib_crypt_crypt+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -33081,35 +31655,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char crypt ();
int
main ()
{
-return ${pbxfuncname} ();
+return crypt ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_crypt_crypt=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_crypt_crypt=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
+$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
+if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
AST_LIBCRYPT_FOUND=yes
else
AST_LIBCRYPT_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_LIBCRYPT_FOUND}" = "yes"; then
@@ -33119,9 +31692,8 @@ fi
LIBCRYPT_INCLUDE="-I${LIBCRYPT_DIR}/include"
fi
LIBCRYPT_INCLUDE="${LIBCRYPT_INCLUDE} "
- if test "xcrypt.h" = "x" ; then # no header, assume found
- LIBCRYPT_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LIBCRYPT_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
@@ -33133,14 +31705,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${LIBCRYPT_HEADER_FOUND}" = "x0" ; then
LIBCRYPT_LIB=""
LIBCRYPT_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- LIBCRYPT_LIB=""
- fi
+
PBX_LIBCRYPT=1
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPT 1
@@ -33231,16 +31801,12 @@ if test "x${PBX_CRYPTO}" != "x1" -a "${USE_CRYPTO}" != "no"; then
pbxlibdir="-L${CRYPTO_DIR}"
fi
fi
- pbxfuncname="AES_encrypt"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_CRYPTO_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_crypto_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcrypto" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lcrypto... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AES_encrypt in -lcrypto" >&5
+$as_echo_n "checking for AES_encrypt in -lcrypto... " >&6; }
+if ${ac_cv_lib_crypto_AES_encrypt+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -33254,35 +31820,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char AES_encrypt ();
int
main ()
{
-return ${pbxfuncname} ();
+return AES_encrypt ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_crypto_AES_encrypt=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_crypto_AES_encrypt=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_AES_encrypt" >&5
+$as_echo "$ac_cv_lib_crypto_AES_encrypt" >&6; }
+if test "x$ac_cv_lib_crypto_AES_encrypt" = xyes; then :
AST_CRYPTO_FOUND=yes
else
AST_CRYPTO_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_CRYPTO_FOUND}" = "yes"; then
@@ -33292,9 +31857,8 @@ fi
CRYPTO_INCLUDE="-I${CRYPTO_DIR}/include"
fi
CRYPTO_INCLUDE="${CRYPTO_INCLUDE} "
- if test "xopenssl/aes.h" = "x" ; then # no header, assume found
- CRYPTO_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${CRYPTO_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "openssl/aes.h" "ac_cv_header_openssl_aes_h" "$ac_includes_default"
@@ -33306,14 +31870,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${CRYPTO_HEADER_FOUND}" = "x0" ; then
CRYPTO_LIB=""
CRYPTO_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- CRYPTO_LIB=""
- fi
+
PBX_CRYPTO=1
cat >>confdefs.h <<_ACEOF
#define HAVE_CRYPTO 1
@@ -33338,16 +31900,12 @@ if test "x${PBX_OPENSSL}" != "x1" -a "${USE_OPENSSL}" != "no"; then
pbxlibdir="-L${OPENSSL_DIR}"
fi
fi
- pbxfuncname="SSL_connect"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_OPENSSL_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_ssl_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lssl" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lssl... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
+$as_echo_n "checking for SSL_connect in -lssl... " >&6; }
+if ${ac_cv_lib_ssl_SSL_connect+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -33361,35 +31919,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char SSL_connect ();
int
main ()
{
-return ${pbxfuncname} ();
+return SSL_connect ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_ssl_SSL_connect=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_ssl_SSL_connect=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5
+$as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then :
AST_OPENSSL_FOUND=yes
else
AST_OPENSSL_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_OPENSSL_FOUND}" = "yes"; then
@@ -33399,9 +31956,8 @@ fi
OPENSSL_INCLUDE="-I${OPENSSL_DIR}/include"
fi
OPENSSL_INCLUDE="${OPENSSL_INCLUDE} "
- if test "xopenssl/ssl.h" = "x" ; then # no header, assume found
- OPENSSL_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${OPENSSL_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
@@ -33413,14 +31969,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${OPENSSL_HEADER_FOUND}" = "x0" ; then
OPENSSL_LIB=""
OPENSSL_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- OPENSSL_LIB=""
- fi
+
PBX_OPENSSL=1
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENSSL 1
@@ -33573,16 +32127,12 @@ if test "x${PBX_OPENSSL_SRTP}" != "x1" -a "${USE_OPENSSL_SRTP}" != "no"; then
pbxlibdir="-L${OPENSSL_SRTP_DIR}"
fi
fi
- pbxfuncname="SSL_CTX_set_tlsext_use_srtp"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_OPENSSL_SRTP_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_ssl_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lssl" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lssl... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set_tlsext_use_srtp in -lssl" >&5
+$as_echo_n "checking for SSL_CTX_set_tlsext_use_srtp in -lssl... " >&6; }
+if ${ac_cv_lib_ssl_SSL_CTX_set_tlsext_use_srtp+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -33596,35 +32146,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char SSL_CTX_set_tlsext_use_srtp ();
int
main ()
{
-return ${pbxfuncname} ();
+return SSL_CTX_set_tlsext_use_srtp ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_ssl_SSL_CTX_set_tlsext_use_srtp=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_ssl_SSL_CTX_set_tlsext_use_srtp=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_set_tlsext_use_srtp" >&5
+$as_echo "$ac_cv_lib_ssl_SSL_CTX_set_tlsext_use_srtp" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_CTX_set_tlsext_use_srtp" = xyes; then :
AST_OPENSSL_SRTP_FOUND=yes
else
AST_OPENSSL_SRTP_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_OPENSSL_SRTP_FOUND}" = "yes"; then
@@ -33634,9 +32183,8 @@ fi
OPENSSL_SRTP_INCLUDE="-I${OPENSSL_SRTP_DIR}/include"
fi
OPENSSL_SRTP_INCLUDE="${OPENSSL_SRTP_INCLUDE} "
- if test "xopenssl/ssl.h" = "x" ; then # no header, assume found
- OPENSSL_SRTP_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${OPENSSL_SRTP_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
@@ -33648,14 +32196,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${OPENSSL_SRTP_HEADER_FOUND}" = "x0" ; then
OPENSSL_SRTP_LIB=""
OPENSSL_SRTP_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- OPENSSL_SRTP_LIB=""
- fi
+
PBX_OPENSSL_SRTP=1
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENSSL_SRTP 1
@@ -33681,16 +32227,12 @@ if test "x${PBX_OPENSSL_EC}" != "x1" -a "${USE_OPENSSL_EC}" != "no"; then
pbxlibdir="-L${OPENSSL_EC_DIR}"
fi
fi
- pbxfuncname="EC_KEY_new_by_curve_name"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_OPENSSL_EC_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_ssl_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lssl" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lssl... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EC_KEY_new_by_curve_name in -lssl" >&5
+$as_echo_n "checking for EC_KEY_new_by_curve_name in -lssl... " >&6; }
+if ${ac_cv_lib_ssl_EC_KEY_new_by_curve_name+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -33704,35 +32246,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char EC_KEY_new_by_curve_name ();
int
main ()
{
-return ${pbxfuncname} ();
+return EC_KEY_new_by_curve_name ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_ssl_EC_KEY_new_by_curve_name=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_ssl_EC_KEY_new_by_curve_name=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_EC_KEY_new_by_curve_name" >&5
+$as_echo "$ac_cv_lib_ssl_EC_KEY_new_by_curve_name" >&6; }
+if test "x$ac_cv_lib_ssl_EC_KEY_new_by_curve_name" = xyes; then :
AST_OPENSSL_EC_FOUND=yes
else
AST_OPENSSL_EC_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_OPENSSL_EC_FOUND}" = "yes"; then
@@ -33742,9 +32283,8 @@ fi
OPENSSL_EC_INCLUDE="-I${OPENSSL_EC_DIR}/include"
fi
OPENSSL_EC_INCLUDE="${OPENSSL_EC_INCLUDE} "
- if test "xopenssl/ec.h" = "x" ; then # no header, assume found
- OPENSSL_EC_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${OPENSSL_EC_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "openssl/ec.h" "ac_cv_header_openssl_ec_h" "$ac_includes_default"
@@ -33756,14 +32296,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${OPENSSL_EC_HEADER_FOUND}" = "x0" ; then
OPENSSL_EC_LIB=""
OPENSSL_EC_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- OPENSSL_EC_LIB=""
- fi
+
PBX_OPENSSL_EC=1
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENSSL_EC 1
@@ -33883,16 +32421,12 @@ if test "x${PBX_SRTP}" != "x1" -a "${USE_SRTP}" != "no"; then
pbxlibdir="-L${SRTP_DIR}"
fi
fi
- pbxfuncname="srtp_init"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SRTP_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_srtp2_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp2" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lsrtp2... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_init in -lsrtp2" >&5
+$as_echo_n "checking for srtp_init in -lsrtp2... " >&6; }
+if ${ac_cv_lib_srtp2_srtp_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -33906,35 +32440,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char srtp_init ();
int
main ()
{
-return ${pbxfuncname} ();
+return srtp_init ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_srtp2_srtp_init=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_srtp2_srtp_init=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_init" >&5
+$as_echo "$ac_cv_lib_srtp2_srtp_init" >&6; }
+if test "x$ac_cv_lib_srtp2_srtp_init" = xyes; then :
AST_SRTP_FOUND=yes
else
AST_SRTP_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SRTP_FOUND}" = "yes"; then
@@ -33944,9 +32477,8 @@ fi
SRTP_INCLUDE="-I${SRTP_DIR}/include"
fi
SRTP_INCLUDE="${SRTP_INCLUDE} "
- if test "xsrtp2/srtp.h" = "x" ; then # no header, assume found
- SRTP_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SRTP_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "srtp2/srtp.h" "ac_cv_header_srtp2_srtp_h" "$ac_includes_default"
@@ -33958,14 +32490,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${SRTP_HEADER_FOUND}" = "x0" ; then
SRTP_LIB=""
SRTP_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SRTP_LIB=""
- fi
+
PBX_SRTP=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SRTP 1
@@ -34065,16 +32595,12 @@ if test "x${PBX_SRTP_256}" != "x1" -a "${USE_SRTP_256}" != "no"; then
pbxlibdir="-L${SRTP_256_DIR}"
fi
fi
- pbxfuncname="srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SRTP_256_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_srtp2_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp2" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lsrtp2... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp2" >&5
+$as_echo_n "checking for srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp2... " >&6; }
+if ${ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -34088,35 +32614,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 ();
int
main ()
{
-return ${pbxfuncname} ();
+return srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&5
+$as_echo "$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&6; }
+if test "x$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" = xyes; then :
AST_SRTP_256_FOUND=yes
else
AST_SRTP_256_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SRTP_256_FOUND}" = "yes"; then
@@ -34126,28 +32651,15 @@ fi
SRTP_256_INCLUDE="-I${SRTP_256_DIR}/include"
fi
SRTP_256_INCLUDE="${SRTP_256_INCLUDE} "
- if test "x" = "x" ; then # no header, assume found
- SRTP_256_HEADER_FOUND="1"
- else # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${SRTP_256_INCLUDE}"
- ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default"
-if test "x$ac_cv_header_" = xyes; then :
- SRTP_256_HEADER_FOUND=1
-else
- SRTP_256_HEADER_FOUND=0
-fi
+ # no header, assume found
+ SRTP_256_HEADER_FOUND="1"
- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
if test "x${SRTP_256_HEADER_FOUND}" = "x0" ; then
SRTP_256_LIB=""
SRTP_256_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SRTP_256_LIB=""
- fi
+
PBX_SRTP_256=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SRTP_256 1
@@ -34169,16 +32681,12 @@ if test "x${PBX_SRTP_192}" != "x1" -a "${USE_SRTP_192}" != "no"; then
pbxlibdir="-L${SRTP_192_DIR}"
fi
fi
- pbxfuncname="srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SRTP_192_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_srtp2_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp2" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lsrtp2... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp2" >&5
+$as_echo_n "checking for srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp2... " >&6; }
+if ${ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -34192,35 +32700,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80 ();
int
main ()
{
-return ${pbxfuncname} ();
+return srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80 ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&5
+$as_echo "$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&6; }
+if test "x$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" = xyes; then :
AST_SRTP_192_FOUND=yes
else
AST_SRTP_192_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SRTP_192_FOUND}" = "yes"; then
@@ -34230,28 +32737,15 @@ fi
SRTP_192_INCLUDE="-I${SRTP_192_DIR}/include"
fi
SRTP_192_INCLUDE="${SRTP_192_INCLUDE} "
- if test "x" = "x" ; then # no header, assume found
- SRTP_192_HEADER_FOUND="1"
- else # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${SRTP_192_INCLUDE}"
- ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default"
-if test "x$ac_cv_header_" = xyes; then :
- SRTP_192_HEADER_FOUND=1
-else
- SRTP_192_HEADER_FOUND=0
-fi
+ # no header, assume found
+ SRTP_192_HEADER_FOUND="1"
- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
if test "x${SRTP_192_HEADER_FOUND}" = "x0" ; then
SRTP_192_LIB=""
SRTP_192_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SRTP_192_LIB=""
- fi
+
PBX_SRTP_192=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SRTP_192 1
@@ -34273,16 +32767,12 @@ if test "x${PBX_SRTP_GCM}" != "x1" -a "${USE_SRTP_GCM}" != "no"; then
pbxlibdir="-L${SRTP_GCM_DIR}"
fi
fi
- pbxfuncname="srtp_crypto_policy_set_aes_gcm_128_8_auth"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SRTP_GCM_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_srtp2_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp2" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lsrtp2... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_crypto_policy_set_aes_gcm_128_8_auth in -lsrtp2" >&5
+$as_echo_n "checking for srtp_crypto_policy_set_aes_gcm_128_8_auth in -lsrtp2... " >&6; }
+if ${ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -34296,35 +32786,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char srtp_crypto_policy_set_aes_gcm_128_8_auth ();
int
main ()
{
-return ${pbxfuncname} ();
+return srtp_crypto_policy_set_aes_gcm_128_8_auth ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&5
+$as_echo "$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&6; }
+if test "x$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth" = xyes; then :
AST_SRTP_GCM_FOUND=yes
else
AST_SRTP_GCM_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SRTP_GCM_FOUND}" = "yes"; then
@@ -34334,28 +32823,15 @@ fi
SRTP_GCM_INCLUDE="-I${SRTP_GCM_DIR}/include"
fi
SRTP_GCM_INCLUDE="${SRTP_GCM_INCLUDE} "
- if test "x" = "x" ; then # no header, assume found
- SRTP_GCM_HEADER_FOUND="1"
- else # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${SRTP_GCM_INCLUDE}"
- ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default"
-if test "x$ac_cv_header_" = xyes; then :
- SRTP_GCM_HEADER_FOUND=1
-else
- SRTP_GCM_HEADER_FOUND=0
-fi
+ # no header, assume found
+ SRTP_GCM_HEADER_FOUND="1"
- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
if test "x${SRTP_GCM_HEADER_FOUND}" = "x0" ; then
SRTP_GCM_LIB=""
SRTP_GCM_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SRTP_GCM_LIB=""
- fi
+
PBX_SRTP_GCM=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SRTP_GCM 1
@@ -34377,16 +32853,12 @@ if test "x${PBX_SRTP_SHUTDOWN}" != "x1" -a "${USE_SRTP_SHUTDOWN}" != "no"; then
pbxlibdir="-L${SRTP_SHUTDOWN_DIR}"
fi
fi
- pbxfuncname="srtp_shutdown"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SRTP_SHUTDOWN_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_srtp2_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp2" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lsrtp2... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_shutdown in -lsrtp2" >&5
+$as_echo_n "checking for srtp_shutdown in -lsrtp2... " >&6; }
+if ${ac_cv_lib_srtp2_srtp_shutdown+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -34400,35 +32872,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char srtp_shutdown ();
int
main ()
{
-return ${pbxfuncname} ();
+return srtp_shutdown ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_srtp2_srtp_shutdown=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_srtp2_srtp_shutdown=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_shutdown" >&5
+$as_echo "$ac_cv_lib_srtp2_srtp_shutdown" >&6; }
+if test "x$ac_cv_lib_srtp2_srtp_shutdown" = xyes; then :
AST_SRTP_SHUTDOWN_FOUND=yes
else
AST_SRTP_SHUTDOWN_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SRTP_SHUTDOWN_FOUND}" = "yes"; then
@@ -34438,9 +32909,8 @@ fi
SRTP_SHUTDOWN_INCLUDE="-I${SRTP_SHUTDOWN_DIR}/include"
fi
SRTP_SHUTDOWN_INCLUDE="${SRTP_SHUTDOWN_INCLUDE} "
- if test "xsrtp2/srtp.h" = "x" ; then # no header, assume found
- SRTP_SHUTDOWN_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SRTP_SHUTDOWN_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "srtp2/srtp.h" "ac_cv_header_srtp2_srtp_h" "$ac_includes_default"
@@ -34452,14 +32922,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${SRTP_SHUTDOWN_HEADER_FOUND}" = "x0" ; then
SRTP_SHUTDOWN_LIB=""
SRTP_SHUTDOWN_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SRTP_SHUTDOWN_LIB=""
- fi
+
PBX_SRTP_SHUTDOWN=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SRTP_SHUTDOWN 1
@@ -34497,16 +32965,12 @@ if test "x${PBX_SRTP}" != "x1" -a "${USE_SRTP}" != "no"; then
pbxlibdir="-L${SRTP_DIR}"
fi
fi
- pbxfuncname="srtp_init"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SRTP_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_srtp_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lsrtp... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_init in -lsrtp" >&5
+$as_echo_n "checking for srtp_init in -lsrtp... " >&6; }
+if ${ac_cv_lib_srtp_srtp_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -34520,35 +32984,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char srtp_init ();
int
main ()
{
-return ${pbxfuncname} ();
+return srtp_init ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_srtp_srtp_init=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_srtp_srtp_init=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_srtp_init" >&5
+$as_echo "$ac_cv_lib_srtp_srtp_init" >&6; }
+if test "x$ac_cv_lib_srtp_srtp_init" = xyes; then :
AST_SRTP_FOUND=yes
else
AST_SRTP_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SRTP_FOUND}" = "yes"; then
@@ -34558,9 +33021,8 @@ fi
SRTP_INCLUDE="-I${SRTP_DIR}/include"
fi
SRTP_INCLUDE="${SRTP_INCLUDE} "
- if test "xsrtp/srtp.h" = "x" ; then # no header, assume found
- SRTP_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SRTP_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "srtp/srtp.h" "ac_cv_header_srtp_srtp_h" "$ac_includes_default"
@@ -34572,14 +33034,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${SRTP_HEADER_FOUND}" = "x0" ; then
SRTP_LIB=""
SRTP_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SRTP_LIB=""
- fi
+
PBX_SRTP=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SRTP 1
@@ -34675,16 +33135,12 @@ if test "x${PBX_SRTP_256}" != "x1" -a "${USE_SRTP_256}" != "no"; then
pbxlibdir="-L${SRTP_256_DIR}"
fi
fi
- pbxfuncname="crypto_policy_set_aes_cm_256_hmac_sha1_80"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SRTP_256_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_srtp_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lsrtp... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp" >&5
+$as_echo_n "checking for crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp... " >&6; }
+if ${ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -34698,35 +33154,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char crypto_policy_set_aes_cm_256_hmac_sha1_80 ();
int
main ()
{
-return ${pbxfuncname} ();
+return crypto_policy_set_aes_cm_256_hmac_sha1_80 ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&5
+$as_echo "$ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&6; }
+if test "x$ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" = xyes; then :
AST_SRTP_256_FOUND=yes
else
AST_SRTP_256_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SRTP_256_FOUND}" = "yes"; then
@@ -34736,28 +33191,15 @@ fi
SRTP_256_INCLUDE="-I${SRTP_256_DIR}/include"
fi
SRTP_256_INCLUDE="${SRTP_256_INCLUDE} "
- if test "x" = "x" ; then # no header, assume found
- SRTP_256_HEADER_FOUND="1"
- else # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${SRTP_256_INCLUDE}"
- ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default"
-if test "x$ac_cv_header_" = xyes; then :
- SRTP_256_HEADER_FOUND=1
-else
- SRTP_256_HEADER_FOUND=0
-fi
+ # no header, assume found
+ SRTP_256_HEADER_FOUND="1"
- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
if test "x${SRTP_256_HEADER_FOUND}" = "x0" ; then
SRTP_256_LIB=""
SRTP_256_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SRTP_256_LIB=""
- fi
+
PBX_SRTP_256=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SRTP_256 1
@@ -34779,16 +33221,12 @@ if test "x${PBX_SRTP_192}" != "x1" -a "${USE_SRTP_192}" != "no"; then
pbxlibdir="-L${SRTP_192_DIR}"
fi
fi
- pbxfuncname="crypto_policy_set_aes_cm_192_hmac_sha1_80"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SRTP_192_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_srtp_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lsrtp... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp" >&5
+$as_echo_n "checking for crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp... " >&6; }
+if ${ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -34802,35 +33240,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char crypto_policy_set_aes_cm_192_hmac_sha1_80 ();
int
main ()
{
-return ${pbxfuncname} ();
+return crypto_policy_set_aes_cm_192_hmac_sha1_80 ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&5
+$as_echo "$ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&6; }
+if test "x$ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" = xyes; then :
AST_SRTP_192_FOUND=yes
else
AST_SRTP_192_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SRTP_192_FOUND}" = "yes"; then
@@ -34840,28 +33277,15 @@ fi
SRTP_192_INCLUDE="-I${SRTP_192_DIR}/include"
fi
SRTP_192_INCLUDE="${SRTP_192_INCLUDE} "
- if test "x" = "x" ; then # no header, assume found
- SRTP_192_HEADER_FOUND="1"
- else # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${SRTP_192_INCLUDE}"
- ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default"
-if test "x$ac_cv_header_" = xyes; then :
- SRTP_192_HEADER_FOUND=1
-else
- SRTP_192_HEADER_FOUND=0
-fi
+ # no header, assume found
+ SRTP_192_HEADER_FOUND="1"
- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
if test "x${SRTP_192_HEADER_FOUND}" = "x0" ; then
SRTP_192_LIB=""
SRTP_192_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SRTP_192_LIB=""
- fi
+
PBX_SRTP_192=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SRTP_192 1
@@ -34883,16 +33307,12 @@ if test "x${PBX_SRTP_GCM}" != "x1" -a "${USE_SRTP_GCM}" != "no"; then
pbxlibdir="-L${SRTP_GCM_DIR}"
fi
fi
- pbxfuncname="crypto_policy_set_aes_gcm_128_8_auth"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SRTP_GCM_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_srtp_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lsrtp... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypto_policy_set_aes_gcm_128_8_auth in -lsrtp" >&5
+$as_echo_n "checking for crypto_policy_set_aes_gcm_128_8_auth in -lsrtp... " >&6; }
+if ${ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -34906,35 +33326,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char crypto_policy_set_aes_gcm_128_8_auth ();
int
main ()
{
-return ${pbxfuncname} ();
+return crypto_policy_set_aes_gcm_128_8_auth ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&5
+$as_echo "$ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&6; }
+if test "x$ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth" = xyes; then :
AST_SRTP_GCM_FOUND=yes
else
AST_SRTP_GCM_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SRTP_GCM_FOUND}" = "yes"; then
@@ -34944,28 +33363,15 @@ fi
SRTP_GCM_INCLUDE="-I${SRTP_GCM_DIR}/include"
fi
SRTP_GCM_INCLUDE="${SRTP_GCM_INCLUDE} "
- if test "x" = "x" ; then # no header, assume found
- SRTP_GCM_HEADER_FOUND="1"
- else # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${SRTP_GCM_INCLUDE}"
- ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default"
-if test "x$ac_cv_header_" = xyes; then :
- SRTP_GCM_HEADER_FOUND=1
-else
- SRTP_GCM_HEADER_FOUND=0
-fi
+ # no header, assume found
+ SRTP_GCM_HEADER_FOUND="1"
- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
if test "x${SRTP_GCM_HEADER_FOUND}" = "x0" ; then
SRTP_GCM_LIB=""
SRTP_GCM_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SRTP_GCM_LIB=""
- fi
+
PBX_SRTP_GCM=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SRTP_GCM 1
@@ -34987,16 +33393,12 @@ if test "x${PBX_SRTP_SHUTDOWN}" != "x1" -a "${USE_SRTP_SHUTDOWN}" != "no"; then
pbxlibdir="-L${SRTP_SHUTDOWN_DIR}"
fi
fi
- pbxfuncname="srtp_shutdown"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SRTP_SHUTDOWN_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_srtp_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lsrtp... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_shutdown in -lsrtp" >&5
+$as_echo_n "checking for srtp_shutdown in -lsrtp... " >&6; }
+if ${ac_cv_lib_srtp_srtp_shutdown+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -35010,35 +33412,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char srtp_shutdown ();
int
main ()
{
-return ${pbxfuncname} ();
+return srtp_shutdown ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_srtp_srtp_shutdown=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_srtp_srtp_shutdown=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_srtp_shutdown" >&5
+$as_echo "$ac_cv_lib_srtp_srtp_shutdown" >&6; }
+if test "x$ac_cv_lib_srtp_srtp_shutdown" = xyes; then :
AST_SRTP_SHUTDOWN_FOUND=yes
else
AST_SRTP_SHUTDOWN_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SRTP_SHUTDOWN_FOUND}" = "yes"; then
@@ -35048,9 +33449,8 @@ fi
SRTP_SHUTDOWN_INCLUDE="-I${SRTP_SHUTDOWN_DIR}/include"
fi
SRTP_SHUTDOWN_INCLUDE="${SRTP_SHUTDOWN_INCLUDE} "
- if test "xsrtp/srtp.h" = "x" ; then # no header, assume found
- SRTP_SHUTDOWN_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SRTP_SHUTDOWN_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "srtp/srtp.h" "ac_cv_header_srtp_srtp_h" "$ac_includes_default"
@@ -35062,14 +33462,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${SRTP_SHUTDOWN_HEADER_FOUND}" = "x0" ; then
SRTP_SHUTDOWN_LIB=""
SRTP_SHUTDOWN_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SRTP_SHUTDOWN_LIB=""
- fi
+
PBX_SRTP_SHUTDOWN=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SRTP_SHUTDOWN 1
@@ -35188,16 +33586,12 @@ if test "x${PBX_HOARD}" != "x1" -a "${USE_HOARD}" != "no"; then
pbxlibdir="-L${HOARD_DIR}"
fi
fi
- pbxfuncname="malloc"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_HOARD_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_hoard_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lhoard" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lhoard... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -lhoard" >&5
+$as_echo_n "checking for malloc in -lhoard... " >&6; }
+if ${ac_cv_lib_hoard_malloc+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -35211,35 +33605,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char malloc ();
int
main ()
{
-return ${pbxfuncname} ();
+return malloc ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_hoard_malloc=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_hoard_malloc=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hoard_malloc" >&5
+$as_echo "$ac_cv_lib_hoard_malloc" >&6; }
+if test "x$ac_cv_lib_hoard_malloc" = xyes; then :
AST_HOARD_FOUND=yes
else
AST_HOARD_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_HOARD_FOUND}" = "yes"; then
@@ -35249,28 +33642,15 @@ fi
HOARD_INCLUDE="-I${HOARD_DIR}/include"
fi
HOARD_INCLUDE="${HOARD_INCLUDE} "
- if test "x" = "x" ; then # no header, assume found
- HOARD_HEADER_FOUND="1"
- else # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${HOARD_INCLUDE}"
- ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default"
-if test "x$ac_cv_header_" = xyes; then :
- HOARD_HEADER_FOUND=1
-else
- HOARD_HEADER_FOUND=0
-fi
+ # no header, assume found
+ HOARD_HEADER_FOUND="1"
- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
if test "x${HOARD_HEADER_FOUND}" = "x0" ; then
HOARD_LIB=""
HOARD_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- HOARD_LIB=""
- fi
+
PBX_HOARD=1
cat >>confdefs.h <<_ACEOF
#define HAVE_HOARD 1
@@ -35293,16 +33673,12 @@ if test "x${PBX_FREETDS}" != "x1" -a "${USE_FREETDS}" != "no"; then
pbxlibdir="-L${FREETDS_DIR}"
fi
fi
- pbxfuncname="dbinit"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_FREETDS_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_sybdb_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsybdb" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lsybdb... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbinit in -lsybdb" >&5
+$as_echo_n "checking for dbinit in -lsybdb... " >&6; }
+if ${ac_cv_lib_sybdb_dbinit+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -35316,35 +33692,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char dbinit ();
int
main ()
{
-return ${pbxfuncname} ();
+return dbinit ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_sybdb_dbinit=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_sybdb_dbinit=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybdb_dbinit" >&5
+$as_echo "$ac_cv_lib_sybdb_dbinit" >&6; }
+if test "x$ac_cv_lib_sybdb_dbinit" = xyes; then :
AST_FREETDS_FOUND=yes
else
AST_FREETDS_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_FREETDS_FOUND}" = "yes"; then
@@ -35354,9 +33729,8 @@ fi
FREETDS_INCLUDE="-I${FREETDS_DIR}/include"
fi
FREETDS_INCLUDE="${FREETDS_INCLUDE} "
- if test "xsybdb.h" = "x" ; then # no header, assume found
- FREETDS_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${FREETDS_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "sybdb.h" "ac_cv_header_sybdb_h" "$ac_includes_default"
@@ -35368,14 +33742,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${FREETDS_HEADER_FOUND}" = "x0" ; then
FREETDS_LIB=""
FREETDS_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- FREETDS_LIB=""
- fi
+
PBX_FREETDS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_FREETDS 1
@@ -35445,16 +33817,12 @@ if test "x${PBX_TONEZONE}" != "x1" -a "${USE_TONEZONE}" != "no"; then
pbxlibdir="-L${TONEZONE_DIR}"
fi
fi
- pbxfuncname="tone_zone_find"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_TONEZONE_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_tonezone_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -ltonezone" >&5
-$as_echo_n "checking for ${pbxfuncname} in -ltonezone... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tone_zone_find in -ltonezone" >&5
+$as_echo_n "checking for tone_zone_find in -ltonezone... " >&6; }
+if ${ac_cv_lib_tonezone_tone_zone_find+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -35468,35 +33836,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char tone_zone_find ();
int
main ()
{
-return ${pbxfuncname} ();
+return tone_zone_find ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_tonezone_tone_zone_find=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_tonezone_tone_zone_find=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tonezone_tone_zone_find" >&5
+$as_echo "$ac_cv_lib_tonezone_tone_zone_find" >&6; }
+if test "x$ac_cv_lib_tonezone_tone_zone_find" = xyes; then :
AST_TONEZONE_FOUND=yes
else
AST_TONEZONE_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_TONEZONE_FOUND}" = "yes"; then
@@ -35506,9 +33873,8 @@ fi
TONEZONE_INCLUDE="-I${TONEZONE_DIR}/include"
fi
TONEZONE_INCLUDE="${TONEZONE_INCLUDE} "
- if test "xdahdi/tonezone.h" = "x" ; then # no header, assume found
- TONEZONE_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${TONEZONE_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "dahdi/tonezone.h" "ac_cv_header_dahdi_tonezone_h" "$ac_includes_default"
@@ -35520,14 +33886,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${TONEZONE_HEADER_FOUND}" = "x0" ; then
TONEZONE_LIB=""
TONEZONE_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- TONEZONE_LIB=""
- fi
+
PBX_TONEZONE=1
cat >>confdefs.h <<_ACEOF
#define HAVE_TONEZONE 1
@@ -35552,16 +33916,12 @@ if test "x${PBX_VORBIS}" != "x1" -a "${USE_VORBIS}" != "no"; then
pbxlibdir="-L${VORBIS_DIR}"
fi
fi
- pbxfuncname="vorbis_info_init"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_VORBIS_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_vorbis_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lvorbis" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lvorbis... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vorbis_info_init in -lvorbis" >&5
+$as_echo_n "checking for vorbis_info_init in -lvorbis... " >&6; }
+if ${ac_cv_lib_vorbis_vorbis_info_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -35575,35 +33935,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char vorbis_info_init ();
int
main ()
{
-return ${pbxfuncname} ();
+return vorbis_info_init ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_vorbis_vorbis_info_init=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_vorbis_vorbis_info_init=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbis_vorbis_info_init" >&5
+$as_echo "$ac_cv_lib_vorbis_vorbis_info_init" >&6; }
+if test "x$ac_cv_lib_vorbis_vorbis_info_init" = xyes; then :
AST_VORBIS_FOUND=yes
else
AST_VORBIS_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_VORBIS_FOUND}" = "yes"; then
@@ -35613,9 +33972,8 @@ fi
VORBIS_INCLUDE="-I${VORBIS_DIR}/include"
fi
VORBIS_INCLUDE="${VORBIS_INCLUDE} "
- if test "xvorbis/codec.h" = "x" ; then # no header, assume found
- VORBIS_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${VORBIS_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "vorbis/codec.h" "ac_cv_header_vorbis_codec_h" "$ac_includes_default"
@@ -35627,14 +33985,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${VORBIS_HEADER_FOUND}" = "x0" ; then
VORBIS_LIB=""
VORBIS_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- VORBIS_LIB=""
- fi
+
PBX_VORBIS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_VORBIS 1
@@ -35657,16 +34013,12 @@ if test "x${PBX_VORBIS}" != "x1" -a "${USE_VORBIS}" != "no"; then
pbxlibdir="-L${VORBIS_DIR}"
fi
fi
- pbxfuncname="vorbis_info_init"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_VORBIS_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_vorbis_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lvorbis" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lvorbis... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vorbis_info_init in -lvorbis" >&5
+$as_echo_n "checking for vorbis_info_init in -lvorbis... " >&6; }
+if ${ac_cv_lib_vorbis_vorbis_info_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -35680,35 +34032,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char vorbis_info_init ();
int
main ()
{
-return ${pbxfuncname} ();
+return vorbis_info_init ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_vorbis_vorbis_info_init=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_vorbis_vorbis_info_init=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbis_vorbis_info_init" >&5
+$as_echo "$ac_cv_lib_vorbis_vorbis_info_init" >&6; }
+if test "x$ac_cv_lib_vorbis_vorbis_info_init" = xyes; then :
AST_VORBIS_FOUND=yes
else
AST_VORBIS_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_VORBIS_FOUND}" = "yes"; then
@@ -35718,9 +34069,8 @@ fi
VORBIS_INCLUDE="-I${VORBIS_DIR}/include"
fi
VORBIS_INCLUDE="${VORBIS_INCLUDE} "
- if test "xvorbis/codec.h" = "x" ; then # no header, assume found
- VORBIS_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${VORBIS_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "vorbis/codec.h" "ac_cv_header_vorbis_codec_h" "$ac_includes_default"
@@ -35732,14 +34082,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${VORBIS_HEADER_FOUND}" = "x0" ; then
VORBIS_LIB=""
VORBIS_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- VORBIS_LIB=""
- fi
+
PBX_VORBIS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_VORBIS 1
@@ -35878,16 +34226,12 @@ if test "x${PBX_ZLIB}" != "x1" -a "${USE_ZLIB}" != "no"; then
pbxlibdir="-L${ZLIB_DIR}"
fi
fi
- pbxfuncname="compress"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_ZLIB_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_z_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lz" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lz... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
+$as_echo_n "checking for compress in -lz... " >&6; }
+if ${ac_cv_lib_z_compress+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -35901,35 +34245,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char compress ();
int
main ()
{
-return ${pbxfuncname} ();
+return compress ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_z_compress=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_z_compress=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
+$as_echo "$ac_cv_lib_z_compress" >&6; }
+if test "x$ac_cv_lib_z_compress" = xyes; then :
AST_ZLIB_FOUND=yes
else
AST_ZLIB_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_ZLIB_FOUND}" = "yes"; then
@@ -35939,9 +34282,8 @@ fi
ZLIB_INCLUDE="-I${ZLIB_DIR}/include"
fi
ZLIB_INCLUDE="${ZLIB_INCLUDE} "
- if test "xzlib.h" = "x" ; then # no header, assume found
- ZLIB_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${ZLIB_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
@@ -35953,14 +34295,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${ZLIB_HEADER_FOUND}" = "x0" ; then
ZLIB_LIB=""
ZLIB_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- ZLIB_LIB=""
- fi
+
PBX_ZLIB=1
cat >>confdefs.h <<_ACEOF
#define HAVE_ZLIB 1
@@ -36228,47 +34568,18 @@ else
fi
if test ! "x${CONFIG_SDL}" = xNo; then
- if test x"" = x ; then A=--cflags ; else A="" ; fi
- SDL_INCLUDE=$(${CONFIG_SDL} $A)
+ SDL_INCLUDE=$(${CONFIG_SDL} --cflags)
SDL_INCLUDE=$(echo ${SDL_INCLUDE} | $SED -e "s|-I|-I${SDL_DIR}|g")
- if test x"" = x ; then A=--libs ; else A="" ; fi
- SDL_LIB=$(${CONFIG_SDL} $A)
+ SDL_LIB=$(${CONFIG_SDL} --libs)
SDL_LIB=$(echo ${SDL_LIB} | $SED -e "s|-L|-L${SDL_DIR}|g")
- if test x"" != x ; then
- saved_cppflags="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${SDL_INCLUDE}"
-
- saved_libs="${LIBS}"
- LIBS=${SDL_LIB}
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
- ;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- PBX_SDL=1
-$as_echo "#define HAVE_SDL 1" >>confdefs.h
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CPPFLAGS="${saved_cppflags}"
- LIBS="${saved_libs}"
- else
PBX_SDL=1
$as_echo "#define HAVE_SDL 1" >>confdefs.h
- fi
+
fi
fi
@@ -36283,16 +34594,12 @@ if test "x${PBX_SDL_IMAGE}" != "x1" -a "${USE_SDL_IMAGE}" != "no"; then
pbxlibdir="-L${SDL_IMAGE_DIR}"
fi
fi
- pbxfuncname="IMG_Load"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_SDL_IMAGE_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} ${SDL_INCLUDE}"
- as_ac_Lib=`$as_echo "ac_cv_lib_SDL_image_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lSDL_image" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lSDL_image... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMG_Load in -lSDL_image" >&5
+$as_echo_n "checking for IMG_Load in -lSDL_image... " >&6; }
+if ${ac_cv_lib_SDL_image_IMG_Load+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -36306,35 +34613,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char IMG_Load ();
int
main ()
{
-return ${pbxfuncname} ();
+return IMG_Load ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_SDL_image_IMG_Load=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_SDL_image_IMG_Load=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_image_IMG_Load" >&5
+$as_echo "$ac_cv_lib_SDL_image_IMG_Load" >&6; }
+if test "x$ac_cv_lib_SDL_image_IMG_Load" = xyes; then :
AST_SDL_IMAGE_FOUND=yes
else
AST_SDL_IMAGE_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_SDL_IMAGE_FOUND}" = "yes"; then
@@ -36344,9 +34650,8 @@ fi
SDL_IMAGE_INCLUDE="-I${SDL_IMAGE_DIR}/include"
fi
SDL_IMAGE_INCLUDE="${SDL_IMAGE_INCLUDE} ${SDL_INCLUDE}"
- if test "xSDL_image.h" = "x" ; then # no header, assume found
- SDL_IMAGE_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SDL_IMAGE_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "SDL_image.h" "ac_cv_header_SDL_image_h" "$ac_includes_default"
@@ -36358,14 +34663,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${SDL_IMAGE_HEADER_FOUND}" = "x0" ; then
SDL_IMAGE_LIB=""
SDL_IMAGE_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- SDL_IMAGE_LIB=""
- fi
+
PBX_SDL_IMAGE=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SDL_IMAGE 1
@@ -36387,16 +34690,12 @@ if test "x${PBX_FFMPEG}" != "x1" -a "${USE_FFMPEG}" != "no"; then
pbxlibdir="-L${FFMPEG_DIR}"
fi
fi
- pbxfuncname="sws_getContext"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_FFMPEG_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
- as_ac_Lib=`$as_echo "ac_cv_lib_avcodec_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lavcodec" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lavcodec... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sws_getContext in -lavcodec" >&5
+$as_echo_n "checking for sws_getContext in -lavcodec... " >&6; }
+if ${ac_cv_lib_avcodec_sws_getContext+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -36410,35 +34709,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char sws_getContext ();
int
main ()
{
-return ${pbxfuncname} ();
+return sws_getContext ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_avcodec_sws_getContext=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_avcodec_sws_getContext=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_sws_getContext" >&5
+$as_echo "$ac_cv_lib_avcodec_sws_getContext" >&6; }
+if test "x$ac_cv_lib_avcodec_sws_getContext" = xyes; then :
AST_FFMPEG_FOUND=yes
else
AST_FFMPEG_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_FFMPEG_FOUND}" = "yes"; then
@@ -36448,9 +34746,8 @@ fi
FFMPEG_INCLUDE="-I${FFMPEG_DIR}/include"
fi
FFMPEG_INCLUDE="${FFMPEG_INCLUDE} ${PTHREAD_CFLAGS}"
- if test "xffmpeg/avcodec.h" = "x" ; then # no header, assume found
- FFMPEG_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${FFMPEG_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "ffmpeg/avcodec.h" "ac_cv_header_ffmpeg_avcodec_h" "$ac_includes_default"
@@ -36462,14 +34759,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${FFMPEG_HEADER_FOUND}" = "x0" ; then
FFMPEG_LIB=""
FFMPEG_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- FFMPEG_LIB=""
- fi
+
PBX_FFMPEG=1
cat >>confdefs.h <<_ACEOF
#define HAVE_FFMPEG 1
@@ -36505,16 +34800,12 @@ if test "x${PBX_X11}" != "x1" -a "${USE_X11}" != "no"; then
pbxlibdir="-L${X11_DIR}"
fi
fi
- pbxfuncname="XOpenDisplay"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_X11_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_X11_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lX11" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lX11... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5
+$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; }
+if ${ac_cv_lib_X11_XOpenDisplay+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -36528,35 +34819,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char XOpenDisplay ();
int
main ()
{
-return ${pbxfuncname} ();
+return XOpenDisplay ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_X11_XOpenDisplay=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_X11_XOpenDisplay=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+$as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; }
+if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes; then :
AST_X11_FOUND=yes
else
AST_X11_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_X11_FOUND}" = "yes"; then
@@ -36566,9 +34856,8 @@ fi
X11_INCLUDE="-I${X11_DIR}/include"
fi
X11_INCLUDE="${X11_INCLUDE} "
- if test "xX11/Xlib.h" = "x" ; then # no header, assume found
- X11_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default"
@@ -36580,14 +34869,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${X11_HEADER_FOUND}" = "x0" ; then
X11_LIB=""
X11_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- X11_LIB=""
- fi
+
PBX_X11=1
cat >>confdefs.h <<_ACEOF
#define HAVE_X11 1
@@ -36613,16 +34900,12 @@ if test "x${PBX_X11}" != "x1" -a "${USE_X11}" != "no"; then
pbxlibdir="-L${X11_DIR}"
fi
fi
- pbxfuncname="XOpenDisplay"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_X11_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} -I/usr/X11R6/include"
- as_ac_Lib=`$as_echo "ac_cv_lib_X11_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lX11" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lX11... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5
+$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; }
+if ${ac_cv_lib_X11_XOpenDisplay+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -36636,35 +34919,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char XOpenDisplay ();
int
main ()
{
-return ${pbxfuncname} ();
+return XOpenDisplay ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_X11_XOpenDisplay=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_X11_XOpenDisplay=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+$as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; }
+if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes; then :
AST_X11_FOUND=yes
else
AST_X11_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_X11_FOUND}" = "yes"; then
@@ -36674,9 +34956,8 @@ fi
X11_INCLUDE="-I${X11_DIR}/include"
fi
X11_INCLUDE="${X11_INCLUDE} -I/usr/X11R6/include"
- if test "xX11/Xlib.h" = "x" ; then # no header, assume found
- X11_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default"
@@ -36688,14 +34969,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${X11_HEADER_FOUND}" = "x0" ; then
X11_LIB=""
X11_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- X11_LIB=""
- fi
+
PBX_X11=1
cat >>confdefs.h <<_ACEOF
#define HAVE_X11 1
diff --git a/menuselect/configure b/menuselect/configure
index 13a330b07683608393a3163baf0e8265a7d57e0a..6e5331eddb9ca7d2ffa32ee2a366d70e2e066c03 100755
--- a/menuselect/configure
+++ b/menuselect/configure
@@ -3941,16 +3941,12 @@ if test "x${PBX_NEWT}" != "x1" -a "${USE_NEWT}" != "no"; then
pbxlibdir="-L${NEWT_DIR}"
fi
fi
- pbxfuncname="newtBell"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_NEWT_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_newt_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lnewt" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lnewt... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for newtBell in -lnewt" >&5
+$as_echo_n "checking for newtBell in -lnewt... " >&6; }
+if ${ac_cv_lib_newt_newtBell+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -3964,35 +3960,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char newtBell ();
int
main ()
{
-return ${pbxfuncname} ();
+return newtBell ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_newt_newtBell=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_newt_newtBell=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_newt_newtBell" >&5
+$as_echo "$ac_cv_lib_newt_newtBell" >&6; }
+if test "x$ac_cv_lib_newt_newtBell" = xyes; then :
AST_NEWT_FOUND=yes
else
AST_NEWT_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_NEWT_FOUND}" = "yes"; then
@@ -4002,9 +3997,8 @@ fi
NEWT_INCLUDE="-I${NEWT_DIR}/include"
fi
NEWT_INCLUDE="${NEWT_INCLUDE} "
- if test "xnewt.h" = "x" ; then # no header, assume found
- NEWT_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${NEWT_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "newt.h" "ac_cv_header_newt_h" "$ac_includes_default"
@@ -4016,14 +4010,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${NEWT_HEADER_FOUND}" = "x0" ; then
NEWT_LIB=""
NEWT_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- NEWT_LIB=""
- fi
+
PBX_NEWT=1
cat >>confdefs.h <<_ACEOF
#define HAVE_NEWT 1
@@ -4045,16 +4037,12 @@ if test "x${PBX_CURSES}" != "x1" -a "${USE_CURSES}" != "no"; then
pbxlibdir="-L${CURSES_DIR}"
fi
fi
- pbxfuncname="initscr"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_CURSES_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_curses_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcurses" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lcurses... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5
+$as_echo_n "checking for initscr in -lcurses... " >&6; }
+if ${ac_cv_lib_curses_initscr+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -4068,35 +4056,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char initscr ();
int
main ()
{
-return ${pbxfuncname} ();
+return initscr ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_curses_initscr=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_curses_initscr=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_initscr" >&5
+$as_echo "$ac_cv_lib_curses_initscr" >&6; }
+if test "x$ac_cv_lib_curses_initscr" = xyes; then :
AST_CURSES_FOUND=yes
else
AST_CURSES_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_CURSES_FOUND}" = "yes"; then
@@ -4106,9 +4093,8 @@ fi
CURSES_INCLUDE="-I${CURSES_DIR}/include"
fi
CURSES_INCLUDE="${CURSES_INCLUDE} "
- if test "xcurses.h" = "x" ; then # no header, assume found
- CURSES_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${CURSES_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
@@ -4120,14 +4106,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${CURSES_HEADER_FOUND}" = "x0" ; then
CURSES_LIB=""
CURSES_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- CURSES_LIB=""
- fi
+
PBX_CURSES=1
cat >>confdefs.h <<_ACEOF
#define HAVE_CURSES 1
@@ -4149,16 +4133,12 @@ if test "x${PBX_NCURSES}" != "x1" -a "${USE_NCURSES}" != "no"; then
pbxlibdir="-L${NCURSES_DIR}"
fi
fi
- pbxfuncname="initscr"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_NCURSES_FOUND=yes
- else
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_ncurses_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lncurses" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lncurses... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
+$as_echo_n "checking for initscr in -lncurses... " >&6; }
+if ${ac_cv_lib_ncurses_initscr+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -4172,35 +4152,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char ${pbxfuncname} ();
+char initscr ();
int
main ()
{
-return ${pbxfuncname} ();
+return initscr ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_ncurses_initscr=yes
else
- eval "$as_ac_Lib=no"
+ ac_cv_lib_ncurses_initscr=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
+$as_echo "$ac_cv_lib_ncurses_initscr" >&6; }
+if test "x$ac_cv_lib_ncurses_initscr" = xyes; then :
AST_NCURSES_FOUND=yes
else
AST_NCURSES_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
+
# now check for the header.
if test "${AST_NCURSES_FOUND}" = "yes"; then
@@ -4210,9 +4189,8 @@ fi
NCURSES_INCLUDE="-I${NCURSES_DIR}/include"
fi
NCURSES_INCLUDE="${NCURSES_INCLUDE} "
- if test "xcurses.h" = "x" ; then # no header, assume found
- NCURSES_HEADER_FOUND="1"
- else # check for the header
+
+ # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${NCURSES_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
@@ -4224,14 +4202,12 @@ fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
+
if test "x${NCURSES_HEADER_FOUND}" = "x0" ; then
NCURSES_LIB=""
NCURSES_INCLUDE=""
else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- NCURSES_LIB=""
- fi
+
PBX_NCURSES=1
cat >>confdefs.h <<_ACEOF
#define HAVE_NCURSES 1
@@ -4415,16 +4391,13 @@ else
fi
if test ! "x${CONFIG_LIBXML2}" = xNo; then
- if test x"" = x ; then A=--cflags ; else A="" ; fi
- LIBXML2_INCLUDE=$(${CONFIG_LIBXML2} $A)
+ LIBXML2_INCLUDE=$(${CONFIG_LIBXML2} --cflags)
LIBXML2_INCLUDE=$(echo ${LIBXML2_INCLUDE} | $SED -e "s|-I|-I${LIBXML2_DIR}|g")
- if test x"" = x ; then A=--libs ; else A="" ; fi
- LIBXML2_LIB=$(${CONFIG_LIBXML2} $A)
+ LIBXML2_LIB=$(${CONFIG_LIBXML2} --libs)
LIBXML2_LIB=$(echo ${LIBXML2_LIB} | $SED -e "s|-L|-L${LIBXML2_DIR}|g")
- if test x"#include <libxml/tree.h>
- #include <libxml/parser.h>" != x ; then
+
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LIBXML2_INCLUDE}"
@@ -4452,12 +4425,7 @@ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CPPFLAGS="${saved_cppflags}"
LIBS="${saved_libs}"
- else
- PBX_LIBXML2=1
-
-$as_echo "#define HAVE_LIBXML2 1" >>confdefs.h
- fi
fi
fi