From: Kevin P. Fleming Date: Fri, 25 May 2007 14:43:54 +0000 (+0000) Subject: have to check for OSP toolkit _after_ checking for OpenSSL X-Git-Tag: 1.4.5~115 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12662b47ab34f2a7114b10780b08ae0acf7abec5;p=thirdparty%2Fasterisk.git have to check for OSP toolkit _after_ checking for OpenSSL git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@66160 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configure b/configure index 67d663ab95..ac470183a1 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 66029 . +# From configure.ac Revision: 66157 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61. # @@ -22233,109 +22233,20 @@ echo "$as_me: *** without explicitly specifying --with-${OGG_OPTION}" >&6;} fi -if test "$PBX_OPENSSL" = "1"; -then - -if test "${USE_OSPTK}" != "no"; then - pbxlibdir="" - if test "x${OSPTK_DIR}" != "x"; then - if test -d ${OSPTK_DIR}/lib; then - pbxlibdir="-L${OSPTK_DIR}/lib" - else - pbxlibdir="-L${OSPTK_DIR}" - fi - fi - { echo "$as_me:$LINENO: checking for OSPPCryptoDecrypt in -losptk" >&5 -echo $ECHO_N "checking for OSPPCryptoDecrypt in -losptk... $ECHO_C" >&6; } -if test "${ac_cv_lib_osptk_OSPPCryptoDecrypt+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-losptk ${pbxlibdir} -lcrypto -lssl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 OSPPCryptoDecrypt (); -int -main () -{ -return OSPPCryptoDecrypt (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_osptk_OSPPCryptoDecrypt=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_osptk_OSPPCryptoDecrypt=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_osptk_OSPPCryptoDecrypt" >&5 -echo "${ECHO_T}$ac_cv_lib_osptk_OSPPCryptoDecrypt" >&6; } -if test $ac_cv_lib_osptk_OSPPCryptoDecrypt = yes; then - AST_OSPTK_FOUND=yes -else - AST_OSPTK_FOUND=no -fi - - - if test "${AST_OSPTK_FOUND}" = "yes"; then - OSPTK_LIB="-losptk -lcrypto -lssl" - OSPTK_HEADER_FOUND="1" - if test "x${OSPTK_DIR}" != "x"; then - OSPTK_LIB="${pbxlibdir} ${OSPTK_LIB}" - OSPTK_INCLUDE="-I${OSPTK_DIR}/include" - saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} -I${OSPTK_DIR}/include" - if test "xosp/osp.h" != "x" ; then - as_ac_Header=`echo "ac_cv_header_${OSPTK_DIR}/include/osp/osp.h" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for ${OSPTK_DIR}/include/osp/osp.h" >&5 -echo $ECHO_N "checking for ${OSPTK_DIR}/include/osp/osp.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +if test "${USE_OSS}" != "no"; then +PBX_OSS=0 +if test "${ac_cv_header_linux_soundcard_h+set}" = set; then + { echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5 +echo $ECHO_N "checking for linux/soundcard.h... $ECHO_C" >&6; } +if test "${ac_cv_header_linux_soundcard_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_soundcard_h" >&5 +echo "${ECHO_T}$ac_cv_header_linux_soundcard_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${OSPTK_DIR}/include/osp/osp.h usability" >&5 -echo $ECHO_N "checking ${OSPTK_DIR}/include/osp/osp.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking linux/soundcard.h usability" >&5 +echo $ECHO_N "checking linux/soundcard.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22343,7 +22254,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <${OSPTK_DIR}/include/osp/osp.h> +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -22375,15 +22286,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking ${OSPTK_DIR}/include/osp/osp.h presence" >&5 -echo $ECHO_N "checking ${OSPTK_DIR}/include/osp/osp.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking linux/soundcard.h presence" >&5 +echo $ECHO_N "checking linux/soundcard.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <${OSPTK_DIR}/include/osp/osp.h> +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -22416,63 +22327,64 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: linux/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: linux/soundcard.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: linux/soundcard.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: linux/soundcard.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: linux/soundcard.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: linux/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: linux/soundcard.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: linux/soundcard.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for ${OSPTK_DIR}/include/osp/osp.h" >&5 -echo $ECHO_N "checking for ${OSPTK_DIR}/include/osp/osp.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +{ echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5 +echo $ECHO_N "checking for linux/soundcard.h... $ECHO_C" >&6; } +if test "${ac_cv_header_linux_soundcard_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=\$ac_header_preproc" + ac_cv_header_linux_soundcard_h=$ac_header_preproc fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_soundcard_h" >&5 +echo "${ECHO_T}$ac_cv_header_linux_soundcard_h" >&6; } fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - OSPTK_HEADER_FOUND=1 -else - OSPTK_HEADER_FOUND=0 +if test $ac_cv_header_linux_soundcard_h = yes; then + + PBX_OSS=1 + +cat >>confdefs.h <<_ACEOF +#define HAVE_OSS 1 +_ACEOF + + fi - fi - CPPFLAGS="${saved_cppflags}" - else - if test "xosp/osp.h" != "x" ; then - if test "${ac_cv_header_osp_osp_h+set}" = set; then - { echo "$as_me:$LINENO: checking for osp/osp.h" >&5 -echo $ECHO_N "checking for osp/osp.h... $ECHO_C" >&6; } -if test "${ac_cv_header_osp_osp_h+set}" = set; then +if test "$PBX_OSS" = "0"; then + if test "${ac_cv_header_sys_soundcard_h+set}" = set; then + { echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 +echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sys_soundcard_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_osp_osp_h" >&5 -echo "${ECHO_T}$ac_cv_header_osp_osp_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking osp/osp.h usability" >&5 -echo $ECHO_N "checking osp/osp.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking sys/soundcard.h usability" >&5 +echo $ECHO_N "checking sys/soundcard.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22480,7 +22392,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -22512,15 +22424,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking osp/osp.h presence" >&5 -echo $ECHO_N "checking osp/osp.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking sys/soundcard.h presence" >&5 +echo $ECHO_N "checking sys/soundcard.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -22553,102 +22465,154 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: osp/osp.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: osp/osp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: osp/osp.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: osp/osp.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sys/soundcard.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: osp/osp.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: osp/osp.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: osp/osp.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: osp/osp.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: osp/osp.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: osp/osp.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: osp/osp.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: osp/osp.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: osp/osp.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: osp/osp.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: osp/osp.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: osp/osp.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sys/soundcard.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sys/soundcard.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sys/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sys/soundcard.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for osp/osp.h" >&5 -echo $ECHO_N "checking for osp/osp.h... $ECHO_C" >&6; } -if test "${ac_cv_header_osp_osp_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 +echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sys_soundcard_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_osp_osp_h=$ac_header_preproc + ac_cv_header_sys_soundcard_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_osp_osp_h" >&5 -echo "${ECHO_T}$ac_cv_header_osp_osp_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6; } fi -if test $ac_cv_header_osp_osp_h = yes; then - OSPTK_HEADER_FOUND=1 -else - OSPTK_HEADER_FOUND=0 -fi +if test $ac_cv_header_sys_soundcard_h = yes; then - - fi - fi - if test "x${OSPTK_HEADER_FOUND}" = "x0" ; then - if test -n "${OSPTK_MANDATORY}" ; - then - { echo "$as_me:$LINENO: ***" >&5 -echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** It appears that you do not have the osptk development package installed." >&5 -echo "$as_me: *** It appears that you do not have the osptk development package installed." >&6;} - { echo "$as_me:$LINENO: *** Please install it to include ${OSPTK_DESCRIP} support, or re-run configure" >&5 -echo "$as_me: *** Please install it to include ${OSPTK_DESCRIP} support, or re-run configure" >&6;} - { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OSPTK_OPTION}" >&5 -echo "$as_me: *** without explicitly specifying --with-${OSPTK_OPTION}" >&6;} - exit 1 - fi - OSPTK_LIB="" - OSPTK_INCLUDE="" - PBX_OSPTK=0 - else - PBX_OSPTK=1 + PBX_OSS=1 cat >>confdefs.h <<_ACEOF -#define HAVE_OSPTK 1 +#define HAVE_OSS 1 _ACEOF + +fi + + +fi +if test "$PBX_OSS" = "0"; then + +if test "${USE_OSS}" != "no"; then + pbxlibdir="" + if test "x${OSS_DIR}" != "x"; then + if test -d ${OSS_DIR}/lib; then + pbxlibdir="-L${OSS_DIR}/lib" + else + pbxlibdir="-L${OSS_DIR}" fi - elif test -n "${OSPTK_MANDATORY}"; - then - { echo "$as_me:$LINENO: ***" >&5 -echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** The ${OSPTK_DESCRIP} installation on this system appears to be broken." >&5 -echo "$as_me: *** The ${OSPTK_DESCRIP} installation on this system appears to be broken." >&6;} - { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 -echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OSPTK_OPTION}" >&5 -echo "$as_me: *** without explicitly specifying --with-${OSPTK_OPTION}" >&6;} - exit 1 fi + { echo "$as_me:$LINENO: checking for oss_ioctl_mixer in -lossaudio" >&5 +echo $ECHO_N "checking for oss_ioctl_mixer in -lossaudio... $ECHO_C" >&6; } +if test "${ac_cv_lib_ossaudio_oss_ioctl_mixer+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lossaudio ${pbxlibdir} $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* 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 oss_ioctl_mixer (); +int +main () +{ +return oss_ioctl_mixer (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_ossaudio_oss_ioctl_mixer=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_ossaudio_oss_ioctl_mixer=no fi +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_oss_ioctl_mixer" >&5 +echo "${ECHO_T}$ac_cv_lib_ossaudio_oss_ioctl_mixer" >&6; } +if test $ac_cv_lib_ossaudio_oss_ioctl_mixer = yes; then + AST_OSS_FOUND=yes +else + AST_OSS_FOUND=no fi -if test "${USE_OSS}" != "no"; then -PBX_OSS=0 -if test "${ac_cv_header_linux_soundcard_h+set}" = set; then - { echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5 -echo $ECHO_N "checking for linux/soundcard.h... $ECHO_C" >&6; } -if test "${ac_cv_header_linux_soundcard_h+set}" = set; then + + if test "${AST_OSS_FOUND}" = "yes"; then + OSS_LIB="-lossaudio " + OSS_HEADER_FOUND="1" + if test "x${OSS_DIR}" != "x"; then + OSS_LIB="${pbxlibdir} ${OSS_LIB}" + OSS_INCLUDE="-I${OSS_DIR}/include" + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} -I${OSS_DIR}/include" + if test "xsoundcard.h" != "x" ; then + as_ac_Header=`echo "ac_cv_header_${OSS_DIR}/include/soundcard.h" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for ${OSS_DIR}/include/soundcard.h" >&5 +echo $ECHO_N "checking for ${OSS_DIR}/include/soundcard.h... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_soundcard_h" >&5 -echo "${ECHO_T}$ac_cv_header_linux_soundcard_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking linux/soundcard.h usability" >&5 -echo $ECHO_N "checking linux/soundcard.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ${OSS_DIR}/include/soundcard.h usability" >&5 +echo $ECHO_N "checking ${OSS_DIR}/include/soundcard.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22656,7 +22620,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include <${OSS_DIR}/include/soundcard.h> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -22688,15 +22652,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking linux/soundcard.h presence" >&5 -echo $ECHO_N "checking linux/soundcard.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ${OSS_DIR}/include/soundcard.h presence" >&5 +echo $ECHO_N "checking ${OSS_DIR}/include/soundcard.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include <${OSS_DIR}/include/soundcard.h> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -22729,64 +22693,63 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: linux/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: linux/soundcard.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: linux/soundcard.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: linux/soundcard.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: linux/soundcard.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: linux/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: linux/soundcard.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: linux/soundcard.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5 -echo $ECHO_N "checking for linux/soundcard.h... $ECHO_C" >&6; } -if test "${ac_cv_header_linux_soundcard_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for ${OSS_DIR}/include/soundcard.h" >&5 +echo $ECHO_N "checking for ${OSS_DIR}/include/soundcard.h... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_linux_soundcard_h=$ac_header_preproc + eval "$as_ac_Header=\$ac_header_preproc" fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_soundcard_h" >&5 -echo "${ECHO_T}$ac_cv_header_linux_soundcard_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi -if test $ac_cv_header_linux_soundcard_h = yes; then - - PBX_OSS=1 - -cat >>confdefs.h <<_ACEOF -#define HAVE_OSS 1 -_ACEOF - - +if test `eval echo '${'$as_ac_Header'}'` = yes; then + OSS_HEADER_FOUND=1 +else + OSS_HEADER_FOUND=0 fi -if test "$PBX_OSS" = "0"; then - if test "${ac_cv_header_sys_soundcard_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 -echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_soundcard_h+set}" = set; then + fi + CPPFLAGS="${saved_cppflags}" + else + if test "xsoundcard.h" != "x" ; then + if test "${ac_cv_header_soundcard_h+set}" = set; then + { echo "$as_me:$LINENO: checking for soundcard.h" >&5 +echo $ECHO_N "checking for soundcard.h... $ECHO_C" >&6; } +if test "${ac_cv_header_soundcard_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_soundcard_h" >&5 +echo "${ECHO_T}$ac_cv_header_soundcard_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking sys/soundcard.h usability" >&5 -echo $ECHO_N "checking sys/soundcard.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking soundcard.h usability" >&5 +echo $ECHO_N "checking soundcard.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22794,7 +22757,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -22826,15 +22789,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking sys/soundcard.h presence" >&5 -echo $ECHO_N "checking sys/soundcard.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking soundcard.h presence" >&5 +echo $ECHO_N "checking soundcard.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -22867,291 +22830,530 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/soundcard.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: soundcard.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: soundcard.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/soundcard.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/soundcard.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/soundcard.h: in the future, the compiler will take precedence" >&2;} - + { echo "$as_me:$LINENO: WARNING: soundcard.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: soundcard.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: soundcard.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: soundcard.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: soundcard.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: soundcard.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: soundcard.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: soundcard.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: soundcard.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: soundcard.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: soundcard.h: in the future, the compiler will take precedence" >&2;} + ;; esac -{ echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 -echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_soundcard_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for soundcard.h" >&5 +echo $ECHO_N "checking for soundcard.h... $ECHO_C" >&6; } +if test "${ac_cv_header_soundcard_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_sys_soundcard_h=$ac_header_preproc + ac_cv_header_soundcard_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_soundcard_h" >&5 +echo "${ECHO_T}$ac_cv_header_soundcard_h" >&6; } fi -if test $ac_cv_header_sys_soundcard_h = yes; then +if test $ac_cv_header_soundcard_h = yes; then + OSS_HEADER_FOUND=1 +else + OSS_HEADER_FOUND=0 +fi - PBX_OSS=1 + + fi + fi + if test "x${OSS_HEADER_FOUND}" = "x0" ; then + if test -n "${OSS_MANDATORY}" ; + then + { echo "$as_me:$LINENO: ***" >&5 +echo "$as_me: ***" >&6;} + { echo "$as_me:$LINENO: *** It appears that you do not have the ossaudio development package installed." >&5 +echo "$as_me: *** It appears that you do not have the ossaudio development package installed." >&6;} + { echo "$as_me:$LINENO: *** Please install it to include ${OSS_DESCRIP} support, or re-run configure" >&5 +echo "$as_me: *** Please install it to include ${OSS_DESCRIP} support, or re-run configure" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OSS_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${OSS_OPTION}" >&6;} + exit 1 + fi + OSS_LIB="" + OSS_INCLUDE="" + PBX_OSS=0 + else + PBX_OSS=1 cat >>confdefs.h <<_ACEOF #define HAVE_OSS 1 _ACEOF - + fi + elif test -n "${OSS_MANDATORY}"; + then + { echo "$as_me:$LINENO: ***" >&5 +echo "$as_me: ***" >&6;} + { echo "$as_me:$LINENO: *** The ${OSS_DESCRIP} installation on this system appears to be broken." >&5 +echo "$as_me: *** The ${OSS_DESCRIP} installation on this system appears to be broken." >&6;} + { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 +echo "$as_me: *** Either correct the installation, or run configure" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OSS_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${OSS_OPTION}" >&6;} + exit 1 + fi fi - fi -if test "$PBX_OSS" = "0"; then +fi -if test "${USE_OSS}" != "no"; then - pbxlibdir="" - if test "x${OSS_DIR}" != "x"; then - if test -d ${OSS_DIR}/lib; then - pbxlibdir="-L${OSS_DIR}/lib" - else - pbxlibdir="-L${OSS_DIR}" - fi - fi - { echo "$as_me:$LINENO: checking for oss_ioctl_mixer in -lossaudio" >&5 -echo $ECHO_N "checking for oss_ioctl_mixer in -lossaudio... $ECHO_C" >&6; } -if test "${ac_cv_lib_ossaudio_oss_ioctl_mixer+set}" = set; then +PG_CONFIG=No +if test "${USE_PGSQL}" != "no"; then + if test "x${PGSQL_DIR}" != "x"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pg_config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pg_config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lossaudio ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + case $PG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PG_CONFIG="$PG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in ${PGSQL_DIR}/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -/* 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 oss_ioctl_mixer (); -int -main () -{ -return oss_ioctl_mixer (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_ossaudio_oss_ioctl_mixer=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ossaudio_oss_ioctl_mixer=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_oss_ioctl_mixer" >&5 -echo "${ECHO_T}$ac_cv_lib_ossaudio_oss_ioctl_mixer" >&6; } -if test $ac_cv_lib_ossaudio_oss_ioctl_mixer = yes; then - AST_OSS_FOUND=yes +PG_CONFIG=$ac_cv_path_PG_CONFIG +if test -n "$PG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PG_CONFIG" >&5 +echo "${ECHO_T}$PG_CONFIG" >&6; } else - AST_OSS_FOUND=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - if test "${AST_OSS_FOUND}" = "yes"; then - OSS_LIB="-lossaudio " - OSS_HEADER_FOUND="1" - if test "x${OSS_DIR}" != "x"; then - OSS_LIB="${pbxlibdir} ${OSS_LIB}" - OSS_INCLUDE="-I${OSS_DIR}/include" - saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} -I${OSS_DIR}/include" - if test "xsoundcard.h" != "x" ; then - as_ac_Header=`echo "ac_cv_header_${OSS_DIR}/include/soundcard.h" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for ${OSS_DIR}/include/soundcard.h" >&5 -echo $ECHO_N "checking for ${OSS_DIR}/include/soundcard.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${OSS_DIR}/include/soundcard.h usability" >&5 -echo $ECHO_N "checking ${OSS_DIR}/include/soundcard.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <${OSS_DIR}/include/soundcard.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +if test -z "$ac_cv_path_PG_CONFIG"; then + ac_pt_PG_CONFIG=$PG_CONFIG + # Extract the first word of "pg_config", so it can be a program name with args. +set dummy pg_config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_PG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + case $ac_pt_PG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PG_CONFIG="$ac_pt_PG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in ${PGSQL_DIR}/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - ac_header_compiler=no + ;; +esac +fi +ac_pt_PG_CONFIG=$ac_cv_path_ac_pt_PG_CONFIG +if test -n "$ac_pt_PG_CONFIG"; then + { echo "$as_me:$LINENO: result: $ac_pt_PG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking ${OSS_DIR}/include/soundcard.h presence" >&5 -echo $ECHO_N "checking ${OSS_DIR}/include/soundcard.h presence... $ECHO_C" >&6; } + if test "x$ac_pt_PG_CONFIG" = x; then + PG_CONFIG="No" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PG_CONFIG=$ac_pt_PG_CONFIG + fi +else + PG_CONFIG="$ac_cv_path_PG_CONFIG" +fi + + if test x"${PG_CONFIG}" = xNo; then + { echo "$as_me:$LINENO: ***" >&5 +echo "$as_me: ***" >&6;} + { echo "$as_me:$LINENO: *** pg_config was not found in the path you specified:" >&5 +echo "$as_me: *** pg_config was not found in the path you specified:" >&6;} + { echo "$as_me:$LINENO: *** ${PGSQL_DIR}/bin" >&5 +echo "$as_me: *** ${PGSQL_DIR}/bin" >&6;} + { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 +echo "$as_me: *** Either correct the installation, or run configure" >&6;} + { echo "$as_me:$LINENO: *** including --without-postgres" >&5 +echo "$as_me: *** including --without-postgres" >&6;} + exit 1 + fi + else + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pg_config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pg_config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PG_CONFIG="$PG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PG_CONFIG=$ac_cv_path_PG_CONFIG +if test -n "$PG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PG_CONFIG" >&5 +echo "${ECHO_T}$PG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PG_CONFIG"; then + ac_pt_PG_CONFIG=$PG_CONFIG + # Extract the first word of "pg_config", so it can be a program name with args. +set dummy pg_config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_PG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PG_CONFIG="$ac_pt_PG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PG_CONFIG=$ac_cv_path_ac_pt_PG_CONFIG +if test -n "$ac_pt_PG_CONFIG"; then + { echo "$as_me:$LINENO: result: $ac_pt_PG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_pt_PG_CONFIG" = x; then + PG_CONFIG="No" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PG_CONFIG=$ac_pt_PG_CONFIG + fi +else + PG_CONFIG="$ac_cv_path_PG_CONFIG" +fi + + fi +fi +if test "${PG_CONFIG}" != No; then + PGSQL_libdir=`${PG_CONFIG} --libdir` + PGSQL_includedir=`${PG_CONFIG} --includedir` + + if test "x$?" != "x0" ; then + if test -n "${PGSQL_MANDATORY}" ; then + { echo "$as_me:$LINENO: ***" >&5 +echo "$as_me: ***" >&6;} + { echo "$as_me:$LINENO: *** The PostgreSQL installation on this system appears to be broken." >&5 +echo "$as_me: *** The PostgreSQL installation on this system appears to be broken." >&6;} + { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 +echo "$as_me: *** Either correct the installation, or run configure" >&6;} + { echo "$as_me:$LINENO: *** including --without-postgres" >&5 +echo "$as_me: *** including --without-postgres" >&6;} + exit 1 + fi + else + { echo "$as_me:$LINENO: checking for PQexec in -lpq" >&5 +echo $ECHO_N "checking for PQexec in -lpq... $ECHO_C" >&6; } +if test "${ac_cv_lib_pq_PQexec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpq -L${PGSQL_libdir} -lz $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <${OSS_DIR}/include/soundcard.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 PQexec (); +int +main () +{ +return PQexec (); + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || test ! -s conftest.err - }; then - ac_header_preproc=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_pq_PQexec=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no + ac_cv_lib_pq_PQexec=no fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQexec" >&5 +echo "${ECHO_T}$ac_cv_lib_pq_PQexec" >&6; } +if test $ac_cv_lib_pq_PQexec = yes; then -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: in the future, the compiler will take precedence" >&2;} +cat >>confdefs.h <<_ACEOF +#define HAVE_PGSQL 1 +_ACEOF - ;; -esac -{ echo "$as_me:$LINENO: checking for ${OSS_DIR}/include/soundcard.h" >&5 -echo $ECHO_N "checking for ${OSS_DIR}/include/soundcard.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - OSS_HEADER_FOUND=1 -else - OSS_HEADER_FOUND=0 + + if test "${ac_cv_lib_pq_PQexec}" = "yes"; then + PGSQL_LIB="-L${PGSQL_libdir} -lpq -lz" + PGSQL_INCLUDE="-I${PGSQL_includedir}" + PBX_PGSQL=1 + elif test -n "${PGSQL_MANDATORY}"; + then + { echo "$as_me:$LINENO: ***" >&5 +echo "$as_me: ***" >&6;} + { echo "$as_me:$LINENO: *** The PostgreSQL installation on this system appears to be broken." >&5 +echo "$as_me: *** The PostgreSQL installation on this system appears to be broken." >&6;} + { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 +echo "$as_me: *** Either correct the installation, or run configure" >&6;} + { echo "$as_me:$LINENO: *** including --without-postgres" >&5 +echo "$as_me: *** including --without-postgres" >&6;} + exit 1 + fi + fi +elif test -n "${PGSQL_MANDATORY}"; +then + { echo "$as_me:$LINENO: ***" >&5 +echo "$as_me: ***" >&6;} + { echo "$as_me:$LINENO: *** The PostgreSQL installation on this system appears to be broken." >&5 +echo "$as_me: *** The PostgreSQL installation on this system appears to be broken." >&6;} + { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 +echo "$as_me: *** Either correct the installation, or run configure" >&6;} + { echo "$as_me:$LINENO: *** including --without-postgres" >&5 +echo "$as_me: *** including --without-postgres" >&6;} + exit 1 fi - fi - CPPFLAGS="${saved_cppflags}" +if test "${USE_POPT}" != "no"; then + pbxlibdir="" + if test "x${POPT_DIR}" != "x"; then + if test -d ${POPT_DIR}/lib; then + pbxlibdir="-L${POPT_DIR}/lib" else - if test "xsoundcard.h" != "x" ; then - if test "${ac_cv_header_soundcard_h+set}" = set; then - { echo "$as_me:$LINENO: checking for soundcard.h" >&5 -echo $ECHO_N "checking for soundcard.h... $ECHO_C" >&6; } -if test "${ac_cv_header_soundcard_h+set}" = set; then + pbxlibdir="-L${POPT_DIR}" + fi + fi + { echo "$as_me:$LINENO: checking for poptStrerror in -lpopt" >&5 +echo $ECHO_N "checking for poptStrerror in -lpopt... $ECHO_C" >&6; } +if test "${ac_cv_lib_popt_poptStrerror+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpopt ${pbxlibdir} $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* 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 poptStrerror (); +int +main () +{ +return poptStrerror (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_popt_poptStrerror=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_popt_poptStrerror=no fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_soundcard_h" >&5 -echo "${ECHO_T}$ac_cv_header_soundcard_h" >&6; } + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_popt_poptStrerror" >&5 +echo "${ECHO_T}$ac_cv_lib_popt_poptStrerror" >&6; } +if test $ac_cv_lib_popt_poptStrerror = yes; then + AST_POPT_FOUND=yes +else + AST_POPT_FOUND=no +fi + + + if test "${AST_POPT_FOUND}" = "yes"; then + POPT_LIB="-lpopt " + POPT_HEADER_FOUND="1" + if test "x${POPT_DIR}" != "x"; then + POPT_LIB="${pbxlibdir} ${POPT_LIB}" + POPT_INCLUDE="-I${POPT_DIR}/include" + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} -I${POPT_DIR}/include" + if test "xpopt.h" != "x" ; then + as_ac_Header=`echo "ac_cv_header_${POPT_DIR}/include/popt.h" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for ${POPT_DIR}/include/popt.h" >&5 +echo $ECHO_N "checking for ${POPT_DIR}/include/popt.h... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking soundcard.h usability" >&5 -echo $ECHO_N "checking soundcard.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ${POPT_DIR}/include/popt.h usability" >&5 +echo $ECHO_N "checking ${POPT_DIR}/include/popt.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23159,7 +23361,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include <${POPT_DIR}/include/popt.h> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -23191,15 +23393,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking soundcard.h presence" >&5 -echo $ECHO_N "checking soundcard.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ${POPT_DIR}/include/popt.h presence" >&5 +echo $ECHO_N "checking ${POPT_DIR}/include/popt.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include <${POPT_DIR}/include/popt.h> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -23232,336 +23434,241 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: soundcard.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: soundcard.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: soundcard.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: soundcard.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: soundcard.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: soundcard.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: soundcard.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: soundcard.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: soundcard.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: soundcard.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: soundcard.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: soundcard.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: soundcard.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for soundcard.h" >&5 -echo $ECHO_N "checking for soundcard.h... $ECHO_C" >&6; } -if test "${ac_cv_header_soundcard_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for ${POPT_DIR}/include/popt.h" >&5 +echo $ECHO_N "checking for ${POPT_DIR}/include/popt.h... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_soundcard_h=$ac_header_preproc + eval "$as_ac_Header=\$ac_header_preproc" fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_soundcard_h" >&5 -echo "${ECHO_T}$ac_cv_header_soundcard_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi -if test $ac_cv_header_soundcard_h = yes; then - OSS_HEADER_FOUND=1 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + POPT_HEADER_FOUND=1 else - OSS_HEADER_FOUND=0 + POPT_HEADER_FOUND=0 fi fi - fi - if test "x${OSS_HEADER_FOUND}" = "x0" ; then - if test -n "${OSS_MANDATORY}" ; - then - { echo "$as_me:$LINENO: ***" >&5 -echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** It appears that you do not have the ossaudio development package installed." >&5 -echo "$as_me: *** It appears that you do not have the ossaudio development package installed." >&6;} - { echo "$as_me:$LINENO: *** Please install it to include ${OSS_DESCRIP} support, or re-run configure" >&5 -echo "$as_me: *** Please install it to include ${OSS_DESCRIP} support, or re-run configure" >&6;} - { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OSS_OPTION}" >&5 -echo "$as_me: *** without explicitly specifying --with-${OSS_OPTION}" >&6;} - exit 1 - fi - OSS_LIB="" - OSS_INCLUDE="" - PBX_OSS=0 + CPPFLAGS="${saved_cppflags}" else - PBX_OSS=1 - -cat >>confdefs.h <<_ACEOF -#define HAVE_OSS 1 -_ACEOF - - fi - elif test -n "${OSS_MANDATORY}"; - then - { echo "$as_me:$LINENO: ***" >&5 -echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** The ${OSS_DESCRIP} installation on this system appears to be broken." >&5 -echo "$as_me: *** The ${OSS_DESCRIP} installation on this system appears to be broken." >&6;} - { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 -echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OSS_OPTION}" >&5 -echo "$as_me: *** without explicitly specifying --with-${OSS_OPTION}" >&6;} - exit 1 - fi -fi - -fi -fi - -PG_CONFIG=No -if test "${USE_PGSQL}" != "no"; then - if test "x${PGSQL_DIR}" != "x"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pg_config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pg_config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PG_CONFIG+set}" = set; then + if test "xpopt.h" != "x" ; then + if test "${ac_cv_header_popt_h+set}" = set; then + { echo "$as_me:$LINENO: checking for popt.h" >&5 +echo $ECHO_N "checking for popt.h... $ECHO_C" >&6; } +if test "${ac_cv_header_popt_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5 +echo "${ECHO_T}$ac_cv_header_popt_h" >&6; } else - case $PG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PG_CONFIG="$PG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in ${PGSQL_DIR}/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; + # Is the header compilable? +{ echo "$as_me:$LINENO: checking popt.h usability" >&5 +echo $ECHO_N "checking popt.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -fi -PG_CONFIG=$ac_cv_path_PG_CONFIG -if test -n "$PG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PG_CONFIG" >&5 -echo "${ECHO_T}$PG_CONFIG" >&6; } +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -fi -if test -z "$ac_cv_path_PG_CONFIG"; then - ac_pt_PG_CONFIG=$PG_CONFIG - # Extract the first word of "pg_config", so it can be a program name with args. -set dummy pg_config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_PG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Is the header present? +{ echo "$as_me:$LINENO: checking popt.h presence" >&5 +echo $ECHO_N "checking popt.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else - case $ac_pt_PG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PG_CONFIG="$ac_pt_PG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in ${PGSQL_DIR}/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - ;; -esac + ac_header_preproc=no fi -ac_pt_PG_CONFIG=$ac_cv_path_ac_pt_PG_CONFIG -if test -n "$ac_pt_PG_CONFIG"; then - { echo "$as_me:$LINENO: result: $ac_pt_PG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PG_CONFIG" >&6; } + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: popt.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: popt.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: popt.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: popt.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: popt.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: popt.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: popt.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: popt.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: popt.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: popt.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: popt.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for popt.h" >&5 +echo $ECHO_N "checking for popt.h... $ECHO_C" >&6; } +if test "${ac_cv_header_popt_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + ac_cv_header_popt_h=$ac_header_preproc fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5 +echo "${ECHO_T}$ac_cv_header_popt_h" >&6; } - if test "x$ac_pt_PG_CONFIG" = x; then - PG_CONFIG="No" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - PG_CONFIG=$ac_pt_PG_CONFIG - fi +fi +if test $ac_cv_header_popt_h = yes; then + POPT_HEADER_FOUND=1 else - PG_CONFIG="$ac_cv_path_PG_CONFIG" + POPT_HEADER_FOUND=0 fi - if test x"${PG_CONFIG}" = xNo; then - { echo "$as_me:$LINENO: ***" >&5 + + fi + fi + if test "x${POPT_HEADER_FOUND}" = "x0" ; then + if test -n "${POPT_MANDATORY}" ; + then + { echo "$as_me:$LINENO: ***" >&5 echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** pg_config was not found in the path you specified:" >&5 -echo "$as_me: *** pg_config was not found in the path you specified:" >&6;} - { echo "$as_me:$LINENO: *** ${PGSQL_DIR}/bin" >&5 -echo "$as_me: *** ${PGSQL_DIR}/bin" >&6;} - { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 + { echo "$as_me:$LINENO: *** It appears that you do not have the popt development package installed." >&5 +echo "$as_me: *** It appears that you do not have the popt development package installed." >&6;} + { echo "$as_me:$LINENO: *** Please install it to include ${POPT_DESCRIP} support, or re-run configure" >&5 +echo "$as_me: *** Please install it to include ${POPT_DESCRIP} support, or re-run configure" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${POPT_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${POPT_OPTION}" >&6;} + exit 1 + fi + POPT_LIB="" + POPT_INCLUDE="" + PBX_POPT=0 + else + PBX_POPT=1 + +cat >>confdefs.h <<_ACEOF +#define HAVE_POPT 1 +_ACEOF + + fi + elif test -n "${POPT_MANDATORY}"; + then + { echo "$as_me:$LINENO: ***" >&5 +echo "$as_me: ***" >&6;} + { echo "$as_me:$LINENO: *** The ${POPT_DESCRIP} installation on this system appears to be broken." >&5 +echo "$as_me: *** The ${POPT_DESCRIP} installation on this system appears to be broken." >&6;} + { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** including --without-postgres" >&5 -echo "$as_me: *** including --without-postgres" >&6;} - exit 1 + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${POPT_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${POPT_OPTION}" >&6;} + exit 1 + fi +fi + + + +if test "${USE_PRI}" != "no"; then + pbxlibdir="" + if test "x${PRI_DIR}" != "x"; then + if test -d ${PRI_DIR}/lib; then + pbxlibdir="-L${PRI_DIR}/lib" + else + pbxlibdir="-L${PRI_DIR}" fi - else - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pg_config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pg_config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PG_CONFIG="$PG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -PG_CONFIG=$ac_cv_path_PG_CONFIG -if test -n "$PG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PG_CONFIG" >&5 -echo "${ECHO_T}$PG_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PG_CONFIG"; then - ac_pt_PG_CONFIG=$PG_CONFIG - # Extract the first word of "pg_config", so it can be a program name with args. -set dummy pg_config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_PG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $ac_pt_PG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PG_CONFIG="$ac_pt_PG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PG_CONFIG=$ac_cv_path_ac_pt_PG_CONFIG -if test -n "$ac_pt_PG_CONFIG"; then - { echo "$as_me:$LINENO: result: $ac_pt_PG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PG_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_pt_PG_CONFIG" = x; then - PG_CONFIG="No" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - PG_CONFIG=$ac_pt_PG_CONFIG - fi -else - PG_CONFIG="$ac_cv_path_PG_CONFIG" -fi - - fi -fi -if test "${PG_CONFIG}" != No; then - PGSQL_libdir=`${PG_CONFIG} --libdir` - PGSQL_includedir=`${PG_CONFIG} --includedir` - - if test "x$?" != "x0" ; then - if test -n "${PGSQL_MANDATORY}" ; then - { echo "$as_me:$LINENO: ***" >&5 -echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** The PostgreSQL installation on this system appears to be broken." >&5 -echo "$as_me: *** The PostgreSQL installation on this system appears to be broken." >&6;} - { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 -echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** including --without-postgres" >&5 -echo "$as_me: *** including --without-postgres" >&6;} - exit 1 - fi - else - { echo "$as_me:$LINENO: checking for PQexec in -lpq" >&5 -echo $ECHO_N "checking for PQexec in -lpq... $ECHO_C" >&6; } -if test "${ac_cv_lib_pq_PQexec+set}" = set; then + fi + { echo "$as_me:$LINENO: checking for pri_call in -lpri" >&5 +echo $ECHO_N "checking for pri_call in -lpri... $ECHO_C" >&6; } +if test "${ac_cv_lib_pri_pri_call+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpq -L${PGSQL_libdir} -lz $LIBS" +LIBS="-lpri ${pbxlibdir} $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23575,11 +23682,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char PQexec (); +char pri_call (); int main () { -return PQexec (); +return pri_call (); ; return 0; } @@ -23602,106 +23709,67 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_pq_PQexec=yes + ac_cv_lib_pri_pri_call=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_pq_PQexec=no + ac_cv_lib_pri_pri_call=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQexec" >&5 -echo "${ECHO_T}$ac_cv_lib_pq_PQexec" >&6; } -if test $ac_cv_lib_pq_PQexec = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_PGSQL 1 -_ACEOF - -fi - - - if test "${ac_cv_lib_pq_PQexec}" = "yes"; then - PGSQL_LIB="-L${PGSQL_libdir} -lpq -lz" - PGSQL_INCLUDE="-I${PGSQL_includedir}" - PBX_PGSQL=1 - elif test -n "${PGSQL_MANDATORY}"; - then - { echo "$as_me:$LINENO: ***" >&5 -echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** The PostgreSQL installation on this system appears to be broken." >&5 -echo "$as_me: *** The PostgreSQL installation on this system appears to be broken." >&6;} - { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 -echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** including --without-postgres" >&5 -echo "$as_me: *** including --without-postgres" >&6;} - exit 1 - fi - fi -elif test -n "${PGSQL_MANDATORY}"; -then - { echo "$as_me:$LINENO: ***" >&5 -echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** The PostgreSQL installation on this system appears to be broken." >&5 -echo "$as_me: *** The PostgreSQL installation on this system appears to be broken." >&6;} - { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 -echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** including --without-postgres" >&5 -echo "$as_me: *** including --without-postgres" >&6;} - exit 1 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pri_pri_call" >&5 +echo "${ECHO_T}$ac_cv_lib_pri_pri_call" >&6; } +if test $ac_cv_lib_pri_pri_call = yes; then + AST_PRI_FOUND=yes +else + AST_PRI_FOUND=no fi -if test "${USE_POPT}" != "no"; then - pbxlibdir="" - if test "x${POPT_DIR}" != "x"; then - if test -d ${POPT_DIR}/lib; then - pbxlibdir="-L${POPT_DIR}/lib" - else - pbxlibdir="-L${POPT_DIR}" - fi - fi - { echo "$as_me:$LINENO: checking for poptStrerror in -lpopt" >&5 -echo $ECHO_N "checking for poptStrerror in -lpopt... $ECHO_C" >&6; } -if test "${ac_cv_lib_popt_poptStrerror+set}" = set; then + if test "${AST_PRI_FOUND}" = "yes"; then + PRI_LIB="-lpri " + PRI_HEADER_FOUND="1" + if test "x${PRI_DIR}" != "x"; then + PRI_LIB="${pbxlibdir} ${PRI_LIB}" + PRI_INCLUDE="-I${PRI_DIR}/include" + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} -I${PRI_DIR}/include" + if test "xlibpri.h" != "x" ; then + as_ac_Header=`echo "ac_cv_header_${PRI_DIR}/include/libpri.h" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for ${PRI_DIR}/include/libpri.h" >&5 +echo $ECHO_N "checking for ${PRI_DIR}/include/libpri.h... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpopt ${pbxlibdir} $LIBS" + # Is the header compilable? +{ echo "$as_me:$LINENO: checking ${PRI_DIR}/include/libpri.h usability" >&5 +echo $ECHO_N "checking ${PRI_DIR}/include/libpri.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* 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 poptStrerror (); -int -main () -{ -return poptStrerror (); - ; - return 0; -} +$ac_includes_default +#include <${PRI_DIR}/include/libpri.h> _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -23710,100 +23778,29 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_popt_poptStrerror=yes + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_popt_poptStrerror=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_popt_poptStrerror" >&5 -echo "${ECHO_T}$ac_cv_lib_popt_poptStrerror" >&6; } -if test $ac_cv_lib_popt_poptStrerror = yes; then - AST_POPT_FOUND=yes -else - AST_POPT_FOUND=no + ac_header_compiler=no fi - - if test "${AST_POPT_FOUND}" = "yes"; then - POPT_LIB="-lpopt " - POPT_HEADER_FOUND="1" - if test "x${POPT_DIR}" != "x"; then - POPT_LIB="${pbxlibdir} ${POPT_LIB}" - POPT_INCLUDE="-I${POPT_DIR}/include" - saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} -I${POPT_DIR}/include" - if test "xpopt.h" != "x" ; then - as_ac_Header=`echo "ac_cv_header_${POPT_DIR}/include/popt.h" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for ${POPT_DIR}/include/popt.h" >&5 -echo $ECHO_N "checking for ${POPT_DIR}/include/popt.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${POPT_DIR}/include/popt.h usability" >&5 -echo $ECHO_N "checking ${POPT_DIR}/include/popt.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <${POPT_DIR}/include/popt.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking ${POPT_DIR}/include/popt.h presence" >&5 -echo $ECHO_N "checking ${POPT_DIR}/include/popt.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ${PRI_DIR}/include/libpri.h presence" >&5 +echo $ECHO_N "checking ${PRI_DIR}/include/libpri.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <${POPT_DIR}/include/popt.h> +#include <${PRI_DIR}/include/libpri.h> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -23836,30 +23833,30 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${PRI_DIR}/include/libpri.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ${PRI_DIR}/include/libpri.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ${PRI_DIR}/include/libpri.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ${PRI_DIR}/include/libpri.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: ${PRI_DIR}/include/libpri.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ${PRI_DIR}/include/libpri.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ${PRI_DIR}/include/libpri.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ${PRI_DIR}/include/libpri.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ${PRI_DIR}/include/libpri.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ${PRI_DIR}/include/libpri.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ${PRI_DIR}/include/libpri.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ${PRI_DIR}/include/libpri.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ${PRI_DIR}/include/libpri.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ${PRI_DIR}/include/libpri.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${PRI_DIR}/include/libpri.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ${PRI_DIR}/include/libpri.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for ${POPT_DIR}/include/popt.h" >&5 -echo $ECHO_N "checking for ${POPT_DIR}/include/popt.h... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking for ${PRI_DIR}/include/libpri.h" >&5 +echo $ECHO_N "checking for ${PRI_DIR}/include/libpri.h... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23871,28 +23868,28 @@ echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - POPT_HEADER_FOUND=1 + PRI_HEADER_FOUND=1 else - POPT_HEADER_FOUND=0 + PRI_HEADER_FOUND=0 fi fi CPPFLAGS="${saved_cppflags}" else - if test "xpopt.h" != "x" ; then - if test "${ac_cv_header_popt_h+set}" = set; then - { echo "$as_me:$LINENO: checking for popt.h" >&5 -echo $ECHO_N "checking for popt.h... $ECHO_C" >&6; } -if test "${ac_cv_header_popt_h+set}" = set; then + if test "xlibpri.h" != "x" ; then + if test "${ac_cv_header_libpri_h+set}" = set; then + { echo "$as_me:$LINENO: checking for libpri.h" >&5 +echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; } +if test "${ac_cv_header_libpri_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5 -echo "${ECHO_T}$ac_cv_header_popt_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5 +echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking popt.h usability" >&5 -echo $ECHO_N "checking popt.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking libpri.h usability" >&5 +echo $ECHO_N "checking libpri.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23900,7 +23897,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -23932,15 +23929,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking popt.h presence" >&5 -echo $ECHO_N "checking popt.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking libpri.h presence" >&5 +echo $ECHO_N "checking libpri.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -23973,763 +23970,364 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: popt.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: libpri.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: popt.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: popt.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: popt.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: popt.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: popt.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: popt.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: libpri.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: libpri.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: libpri.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: libpri.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: libpri.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for popt.h" >&5 -echo $ECHO_N "checking for popt.h... $ECHO_C" >&6; } -if test "${ac_cv_header_popt_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for libpri.h" >&5 +echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; } +if test "${ac_cv_header_libpri_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_popt_h=$ac_header_preproc + ac_cv_header_libpri_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5 -echo "${ECHO_T}$ac_cv_header_popt_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5 +echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; } fi -if test $ac_cv_header_popt_h = yes; then - POPT_HEADER_FOUND=1 +if test $ac_cv_header_libpri_h = yes; then + PRI_HEADER_FOUND=1 else - POPT_HEADER_FOUND=0 + PRI_HEADER_FOUND=0 fi fi fi - if test "x${POPT_HEADER_FOUND}" = "x0" ; then - if test -n "${POPT_MANDATORY}" ; + if test "x${PRI_HEADER_FOUND}" = "x0" ; then + if test -n "${PRI_MANDATORY}" ; then { echo "$as_me:$LINENO: ***" >&5 echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** It appears that you do not have the popt development package installed." >&5 -echo "$as_me: *** It appears that you do not have the popt development package installed." >&6;} - { echo "$as_me:$LINENO: *** Please install it to include ${POPT_DESCRIP} support, or re-run configure" >&5 -echo "$as_me: *** Please install it to include ${POPT_DESCRIP} support, or re-run configure" >&6;} - { echo "$as_me:$LINENO: *** without explicitly specifying --with-${POPT_OPTION}" >&5 -echo "$as_me: *** without explicitly specifying --with-${POPT_OPTION}" >&6;} + { echo "$as_me:$LINENO: *** It appears that you do not have the pri development package installed." >&5 +echo "$as_me: *** It appears that you do not have the pri development package installed." >&6;} + { echo "$as_me:$LINENO: *** Please install it to include ${PRI_DESCRIP} support, or re-run configure" >&5 +echo "$as_me: *** Please install it to include ${PRI_DESCRIP} support, or re-run configure" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${PRI_OPTION}" >&6;} exit 1 fi - POPT_LIB="" - POPT_INCLUDE="" - PBX_POPT=0 + PRI_LIB="" + PRI_INCLUDE="" + PBX_PRI=0 else - PBX_POPT=1 + PBX_PRI=1 cat >>confdefs.h <<_ACEOF -#define HAVE_POPT 1 +#define HAVE_PRI 1 _ACEOF fi - elif test -n "${POPT_MANDATORY}"; + elif test -n "${PRI_MANDATORY}"; then { echo "$as_me:$LINENO: ***" >&5 echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** The ${POPT_DESCRIP} installation on this system appears to be broken." >&5 -echo "$as_me: *** The ${POPT_DESCRIP} installation on this system appears to be broken." >&6;} + { echo "$as_me:$LINENO: *** The ${PRI_DESCRIP} installation on this system appears to be broken." >&5 +echo "$as_me: *** The ${PRI_DESCRIP} installation on this system appears to be broken." >&6;} { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** without explicitly specifying --with-${POPT_OPTION}" >&5 -echo "$as_me: *** without explicitly specifying --with-${POPT_OPTION}" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${PRI_OPTION}" >&6;} exit 1 fi fi +if test "${USE_PWLIB}" != "no"; then + if test -n "${PWLIB_DIR}"; then + PWLIBDIR="${PWLIB_DIR}" + fi -if test "${USE_PRI}" != "no"; then - pbxlibdir="" - if test "x${PRI_DIR}" != "x"; then - if test -d ${PRI_DIR}/lib; then - pbxlibdir="-L${PRI_DIR}/lib" - else - pbxlibdir="-L${PRI_DIR}" - fi - fi - { echo "$as_me:$LINENO: checking for pri_call in -lpri" >&5 -echo $ECHO_N "checking for pri_call in -lpri... $ECHO_C" >&6; } -if test "${ac_cv_lib_pri_pri_call+set}" = set; then +PWLIB_INCDIR= +PWLIB_LIBDIR= +if test "${PWLIBDIR:-unset}" != "unset" ; then + as_ac_File=`echo "ac_cv_file_${PWLIBDIR}/version.h" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${PWLIBDIR}/version.h" >&5 +echo $ECHO_N "checking for ${PWLIBDIR}/version.h... $ECHO_C" >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpri ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 pri_call (); -int -main () -{ -return pri_call (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_pri_pri_call=yes + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "${PWLIBDIR}/version.h"; then + eval "$as_ac_File=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_pri_pri_call=no + eval "$as_ac_File=no" +fi +fi +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then + HAS_PWLIB=1 fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pri_pri_call" >&5 -echo "${ECHO_T}$ac_cv_lib_pri_pri_call" >&6; } -if test $ac_cv_lib_pri_pri_call = yes; then - AST_PRI_FOUND=yes +if test "${HAS_PWLIB:-unset}" = "unset" ; then + if test "${OPENH323DIR:-unset}" != "unset"; then + as_ac_File=`echo "ac_cv_file_${OPENH323DIR}/../pwlib/version.h" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${OPENH323DIR}/../pwlib/version.h" >&5 +echo $ECHO_N "checking for ${OPENH323DIR}/../pwlib/version.h... $ECHO_C" >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - AST_PRI_FOUND=no + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "${OPENH323DIR}/../pwlib/version.h"; then + eval "$as_ac_File=yes" +else + eval "$as_ac_File=no" +fi +fi +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then + HAS_PWLIB=1 fi - - if test "${AST_PRI_FOUND}" = "yes"; then - PRI_LIB="-lpri " - PRI_HEADER_FOUND="1" - if test "x${PRI_DIR}" != "x"; then - PRI_LIB="${pbxlibdir} ${PRI_LIB}" - PRI_INCLUDE="-I${PRI_DIR}/include" - saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} -I${PRI_DIR}/include" - if test "xlibpri.h" != "x" ; then - as_ac_Header=`echo "ac_cv_header_${PRI_DIR}/include/libpri.h" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for ${PRI_DIR}/include/libpri.h" >&5 -echo $ECHO_N "checking for ${PRI_DIR}/include/libpri.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + fi + if test "${HAS_PWLIB:-unset}" != "unset" ; then + PWLIBDIR="${OPENH323DIR}/../pwlib" + else + as_ac_File=`echo "ac_cv_file_${HOME}/pwlib/include/ptlib.h" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${HOME}/pwlib/include/ptlib.h" >&5 +echo $ECHO_N "checking for ${HOME}/pwlib/include/ptlib.h... $ECHO_C" >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "${HOME}/pwlib/include/ptlib.h"; then + eval "$as_ac_File=yes" +else + eval "$as_ac_File=no" fi -ac_res=`eval echo '${'$as_ac_Header'}'` +fi +ac_res=`eval echo '${'$as_ac_File'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then + HAS_PWLIB=1 +fi + + if test "${HAS_PWLIB:-unset}" != "unset" ; then + PWLIBDIR="${HOME}/pwlib" + else + { echo "$as_me:$LINENO: checking for /usr/local/include/ptlib.h" >&5 +echo $ECHO_N "checking for /usr/local/include/ptlib.h... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_local_include_ptlib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${PRI_DIR}/include/libpri.h usability" >&5 -echo $ECHO_N "checking ${PRI_DIR}/include/libpri.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <${PRI_DIR}/include/libpri.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "/usr/local/include/ptlib.h"; then + ac_cv_file__usr_local_include_ptlib_h=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + ac_cv_file__usr_local_include_ptlib_h=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_ptlib_h" >&5 +echo "${ECHO_T}$ac_cv_file__usr_local_include_ptlib_h" >&6; } +if test $ac_cv_file__usr_local_include_ptlib_h = yes; then + HAS_PWLIB=1 fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } + if test "${HAS_PWLIB:-unset}" != "unset" ; then + # Extract the first word of "ptlib-config", so it can be a program name with args. +set dummy ptlib-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PTLIB_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PTLIB_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PTLIB_CONFIG="$PTLIB_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /usr/local/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PTLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -# Is the header present? -{ echo "$as_me:$LINENO: checking ${PRI_DIR}/include/libpri.h presence" >&5 -echo $ECHO_N "checking ${PRI_DIR}/include/libpri.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <${PRI_DIR}/include/libpri.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +fi +PTLIB_CONFIG=$ac_cv_path_PTLIB_CONFIG +if test -n "$PTLIB_CONFIG"; then + { echo "$as_me:$LINENO: result: $PTLIB_CONFIG" >&5 +echo "${ECHO_T}$PTLIB_CONFIG" >&6; } else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ${PRI_DIR}/include/libpri.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${PRI_DIR}/include/libpri.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PRI_DIR}/include/libpri.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${PRI_DIR}/include/libpri.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${PRI_DIR}/include/libpri.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${PRI_DIR}/include/libpri.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PRI_DIR}/include/libpri.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${PRI_DIR}/include/libpri.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PRI_DIR}/include/libpri.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${PRI_DIR}/include/libpri.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PRI_DIR}/include/libpri.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${PRI_DIR}/include/libpri.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PRI_DIR}/include/libpri.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${PRI_DIR}/include/libpri.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PRI_DIR}/include/libpri.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${PRI_DIR}/include/libpri.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for ${PRI_DIR}/include/libpri.h" >&5 -echo $ECHO_N "checking for ${PRI_DIR}/include/libpri.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + if test "${PTLIB_CONFIG:-unset}" = "unset" ; then + # Extract the first word of "ptlib-config", so it can be a program name with args. +set dummy ptlib-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PTLIB_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } + case $PTLIB_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PTLIB_CONFIG="$PTLIB_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /usr/local/share/pwlib/make +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PTLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + ;; +esac fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - PRI_HEADER_FOUND=1 +PTLIB_CONFIG=$ac_cv_path_PTLIB_CONFIG +if test -n "$PTLIB_CONFIG"; then + { echo "$as_me:$LINENO: result: $PTLIB_CONFIG" >&5 +echo "${ECHO_T}$PTLIB_CONFIG" >&6; } else - PRI_HEADER_FOUND=0 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - fi - CPPFLAGS="${saved_cppflags}" + fi + PWLIB_INCDIR="/usr/local/include" + PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir` + if test "${PWLIB_LIBDIR:-unset}" = "unset"; then + if test "x$LIB64" != "x"; then + PWLIB_LIBDIR="/usr/local/lib64" + else + PWLIB_LIBDIR="/usr/local/lib" + fi + fi + PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs` + PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`" else - if test "xlibpri.h" != "x" ; then - if test "${ac_cv_header_libpri_h+set}" = set; then - { echo "$as_me:$LINENO: checking for libpri.h" >&5 -echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libpri_h+set}" = set; then + { echo "$as_me:$LINENO: checking for /usr/include/ptlib.h" >&5 +echo $ECHO_N "checking for /usr/include/ptlib.h... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_include_ptlib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5 -echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking libpri.h usability" >&5 -echo $ECHO_N "checking libpri.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "/usr/include/ptlib.h"; then + ac_cv_file__usr_include_ptlib_h=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + ac_cv_file__usr_include_ptlib_h=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking libpri.h presence" >&5 -echo $ECHO_N "checking libpri.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_include_ptlib_h" >&5 +echo "${ECHO_T}$ac_cv_file__usr_include_ptlib_h" >&6; } +if test $ac_cv_file__usr_include_ptlib_h = yes; then + HAS_PWLIB=1 fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: libpri.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: libpri.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: libpri.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: libpri.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: libpri.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libpri.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: libpri.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for libpri.h" >&5 -echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libpri_h+set}" = set; then + if test "${HAS_PWLIB:-unset}" != "unset" ; then + # Extract the first word of "ptlib-config", so it can be a program name with args. +set dummy ptlib-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PTLIB_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_libpri_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5 -echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; } + case $PTLIB_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PTLIB_CONFIG="$PTLIB_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /usr/share/pwlib/make +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PTLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + ;; +esac fi -if test $ac_cv_header_libpri_h = yes; then - PRI_HEADER_FOUND=1 +PTLIB_CONFIG=$ac_cv_path_PTLIB_CONFIG +if test -n "$PTLIB_CONFIG"; then + { echo "$as_me:$LINENO: result: $PTLIB_CONFIG" >&5 +echo "${ECHO_T}$PTLIB_CONFIG" >&6; } else - PRI_HEADER_FOUND=0 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - fi - fi - if test "x${PRI_HEADER_FOUND}" = "x0" ; then - if test -n "${PRI_MANDATORY}" ; - then - { echo "$as_me:$LINENO: ***" >&5 -echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** It appears that you do not have the pri development package installed." >&5 -echo "$as_me: *** It appears that you do not have the pri development package installed." >&6;} - { echo "$as_me:$LINENO: *** Please install it to include ${PRI_DESCRIP} support, or re-run configure" >&5 -echo "$as_me: *** Please install it to include ${PRI_DESCRIP} support, or re-run configure" >&6;} - { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_OPTION}" >&5 -echo "$as_me: *** without explicitly specifying --with-${PRI_OPTION}" >&6;} - exit 1 - fi - PRI_LIB="" - PRI_INCLUDE="" - PBX_PRI=0 - else - PBX_PRI=1 - -cat >>confdefs.h <<_ACEOF -#define HAVE_PRI 1 -_ACEOF - - fi - elif test -n "${PRI_MANDATORY}"; - then - { echo "$as_me:$LINENO: ***" >&5 -echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** The ${PRI_DESCRIP} installation on this system appears to be broken." >&5 -echo "$as_me: *** The ${PRI_DESCRIP} installation on this system appears to be broken." >&6;} - { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 -echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_OPTION}" >&5 -echo "$as_me: *** without explicitly specifying --with-${PRI_OPTION}" >&6;} - exit 1 - fi -fi - - -if test "${USE_PWLIB}" != "no"; then - if test -n "${PWLIB_DIR}"; then - PWLIBDIR="${PWLIB_DIR}" - fi - -PWLIB_INCDIR= -PWLIB_LIBDIR= -if test "${PWLIBDIR:-unset}" != "unset" ; then - as_ac_File=`echo "ac_cv_file_${PWLIBDIR}/version.h" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${PWLIBDIR}/version.h" >&5 -echo $ECHO_N "checking for ${PWLIBDIR}/version.h... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } -if test -r "${PWLIBDIR}/version.h"; then - eval "$as_ac_File=yes" -else - eval "$as_ac_File=no" -fi -fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_File'}'` = yes; then - HAS_PWLIB=1 -fi - -fi -if test "${HAS_PWLIB:-unset}" = "unset" ; then - if test "${OPENH323DIR:-unset}" != "unset"; then - as_ac_File=`echo "ac_cv_file_${OPENH323DIR}/../pwlib/version.h" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${OPENH323DIR}/../pwlib/version.h" >&5 -echo $ECHO_N "checking for ${OPENH323DIR}/../pwlib/version.h... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } -if test -r "${OPENH323DIR}/../pwlib/version.h"; then - eval "$as_ac_File=yes" -else - eval "$as_ac_File=no" -fi -fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_File'}'` = yes; then - HAS_PWLIB=1 -fi - - fi - if test "${HAS_PWLIB:-unset}" != "unset" ; then - PWLIBDIR="${OPENH323DIR}/../pwlib" - else - as_ac_File=`echo "ac_cv_file_${HOME}/pwlib/include/ptlib.h" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${HOME}/pwlib/include/ptlib.h" >&5 -echo $ECHO_N "checking for ${HOME}/pwlib/include/ptlib.h... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } -if test -r "${HOME}/pwlib/include/ptlib.h"; then - eval "$as_ac_File=yes" -else - eval "$as_ac_File=no" -fi -fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_File'}'` = yes; then - HAS_PWLIB=1 -fi - - if test "${HAS_PWLIB:-unset}" != "unset" ; then - PWLIBDIR="${HOME}/pwlib" - else - { echo "$as_me:$LINENO: checking for /usr/local/include/ptlib.h" >&5 -echo $ECHO_N "checking for /usr/local/include/ptlib.h... $ECHO_C" >&6; } -if test "${ac_cv_file__usr_local_include_ptlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } -if test -r "/usr/local/include/ptlib.h"; then - ac_cv_file__usr_local_include_ptlib_h=yes -else - ac_cv_file__usr_local_include_ptlib_h=no -fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_ptlib_h" >&5 -echo "${ECHO_T}$ac_cv_file__usr_local_include_ptlib_h" >&6; } -if test $ac_cv_file__usr_local_include_ptlib_h = yes; then - HAS_PWLIB=1 -fi - - if test "${HAS_PWLIB:-unset}" != "unset" ; then - # Extract the first word of "ptlib-config", so it can be a program name with args. -set dummy ptlib-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PTLIB_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PTLIB_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PTLIB_CONFIG="$PTLIB_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/local/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PTLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -PTLIB_CONFIG=$ac_cv_path_PTLIB_CONFIG -if test -n "$PTLIB_CONFIG"; then - { echo "$as_me:$LINENO: result: $PTLIB_CONFIG" >&5 -echo "${ECHO_T}$PTLIB_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - if test "${PTLIB_CONFIG:-unset}" = "unset" ; then - # Extract the first word of "ptlib-config", so it can be a program name with args. -set dummy ptlib-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PTLIB_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PTLIB_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PTLIB_CONFIG="$PTLIB_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/local/share/pwlib/make -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PTLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -PTLIB_CONFIG=$ac_cv_path_PTLIB_CONFIG -if test -n "$PTLIB_CONFIG"; then - { echo "$as_me:$LINENO: result: $PTLIB_CONFIG" >&5 -echo "${ECHO_T}$PTLIB_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - fi - PWLIB_INCDIR="/usr/local/include" - PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir` - if test "${PWLIB_LIBDIR:-unset}" = "unset"; then - if test "x$LIB64" != "x"; then - PWLIB_LIBDIR="/usr/local/lib64" - else - PWLIB_LIBDIR="/usr/local/lib" - fi - fi - PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs` - PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`" - else - { echo "$as_me:$LINENO: checking for /usr/include/ptlib.h" >&5 -echo $ECHO_N "checking for /usr/include/ptlib.h... $ECHO_C" >&6; } -if test "${ac_cv_file__usr_include_ptlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } -if test -r "/usr/include/ptlib.h"; then - ac_cv_file__usr_include_ptlib_h=yes -else - ac_cv_file__usr_include_ptlib_h=no -fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_include_ptlib_h" >&5 -echo "${ECHO_T}$ac_cv_file__usr_include_ptlib_h" >&6; } -if test $ac_cv_file__usr_include_ptlib_h = yes; then - HAS_PWLIB=1 -fi - - if test "${HAS_PWLIB:-unset}" != "unset" ; then - # Extract the first word of "ptlib-config", so it can be a program name with args. -set dummy ptlib-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PTLIB_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PTLIB_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PTLIB_CONFIG="$PTLIB_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/share/pwlib/make -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PTLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -PTLIB_CONFIG=$ac_cv_path_PTLIB_CONFIG -if test -n "$PTLIB_CONFIG"; then - { echo "$as_me:$LINENO: result: $PTLIB_CONFIG" >&5 -echo "${ECHO_T}$PTLIB_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - PWLIB_INCDIR="/usr/include" - PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir` - if test "${PWLIB_LIBDIR:-unset}" = "unset"; then - if test "x$LIB64" != "x"; then - PWLIB_LIBDIR="/usr/lib64" - else - PWLIB_LIBDIR="/usr/lib" - fi - fi - PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs` - PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`" - fi + PWLIB_INCDIR="/usr/include" + PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir` + if test "${PWLIB_LIBDIR:-unset}" = "unset"; then + if test "x$LIB64" != "x"; then + PWLIB_LIBDIR="/usr/lib64" + else + PWLIB_LIBDIR="/usr/lib" + fi + fi + PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs` + PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`" + fi fi fi fi @@ -25171,149 +24769,535 @@ if test $ac_cv_file__usr_include_openh323_h323_h = yes; then HAS_OPENH323=1 fi - if test "${HAS_OPENH323:-unset}" != "unset" ; then - OPENH323DIR="/usr/share/openh323" - OPENH323_INCDIR="/usr/include/openh323" - if test "x$LIB64" != "x"; then - OPENH323_LIBDIR="/usr/lib64" - else - OPENH323_LIBDIR="/usr/lib" - fi - fi - fi - fi - fi -fi + if test "${HAS_OPENH323:-unset}" != "unset" ; then + OPENH323DIR="/usr/share/openh323" + OPENH323_INCDIR="/usr/include/openh323" + if test "x$LIB64" != "x"; then + OPENH323_LIBDIR="/usr/lib64" + else + OPENH323_LIBDIR="/usr/lib" + fi + fi + fi + fi + fi +fi + +if test "${HAS_OPENH323:-unset}" != "unset" ; then + if test "${OPENH323_INCDIR:-unset}" = "unset"; then + OPENH323_INCDIR="${OPENH323DIR}/include" + fi + if test "${OPENH323_LIBDIR:-unset}" = "unset"; then + OPENH323_LIBDIR="${OPENH323DIR}/lib" + fi + + OPENH323_LIBDIR="`cd ${OPENH323_LIBDIR}; pwd`" + OPENH323_INCDIR="`cd ${OPENH323_INCDIR}; pwd`" + OPENH323DIR="`cd ${OPENH323DIR}; pwd`" + + + + +fi + + + if test "${HAS_OPENH323:-unset}" != "unset"; then + OPENH323_VERSION=`grep "OPENH323_VERSION" ${OPENH323_INCDIR}/openh323buildopts.h | cut -f2 -d ' ' | sed -e 's/"//g'` + OPENH323_MAJOR_VERSION=`echo ${OPENH323_VERSION} | cut -f1 -d.` + OPENH323_MINOR_VERSION=`echo ${OPENH323_VERSION} | cut -f2 -d.` + OPENH323_BUILD_NUMBER=`echo ${OPENH323_VERSION} | cut -f3 -d.` + let OPENH323_VER=${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER} + let OPENH323_REQ=1*10000+17*100+3 + + { echo "$as_me:$LINENO: checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323" >&5 +echo $ECHO_N "checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323... $ECHO_C" >&6; } + if test ${OPENH323_VER} -lt ${OPENH323_REQ}; then + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + unset HAS_OPENH323 + else + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + fi + fi + + + if test "${HAS_OPENH323:-unset}" != "unset"; then + { echo "$as_me:$LINENO: checking OpenH323 build option" >&5 +echo $ECHO_N "checking OpenH323 build option... $ECHO_C" >&6; } + OPENH323_SUFFIX= + prefixes="h323_${PWLIB_PLATFORM}_ h323_ openh323" + for pfx in $prefixes; do + files=`ls -l ${OPENH323_LIBDIR}/lib${pfx}*.so* 2>/dev/null` + libfile= + if test -n "$files"; then + for f in $files; do + if test -f $f -a ! -L $f; then + libfile=`basename $f` + break; + fi + done + fi + if test -n "$libfile"; then + OPENH323_PREFIX=$pfx + break; + fi + done + if test "${libfile:-unset}" != "unset"; then + OPENH323_SUFFIX=`eval "echo ${libfile} | sed -e 's/lib${OPENH323_PREFIX}\([^.]*\)\..*/\1/'"` + fi + case "${OPENH323_SUFFIX}" in + n) + OPENH323_BUILD="notrace";; + r) + OPENH323_BUILD="opt";; + d) + OPENH323_BUILD="debug";; + *) + if test "${OPENH323_PREFIX:-undef}" = "openh323"; then + notrace=`eval "grep NOTRACE ${OPENH323DIR}/openh323u.mak | grep = | sed -e 's/[A-Z0-9_]*[ ]*=[ ]*//'"` + if test "x$notrace" = "x"; then + notrace="0" + fi + if test "$notrace" -ne 0; then + OPENH323_BUILD="notrace" + else + OPENH323_BUILD="opt" + fi + OPENH323_LIB="-l${OPENH323_PREFIX}" + else + OPENH323_BUILD="notrace" + fi + ;; + esac + { echo "$as_me:$LINENO: result: ${OPENH323_BUILD}" >&5 +echo "${ECHO_T}${OPENH323_BUILD}" >&6; } + + + + fi + + PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}" + + if test "${HAS_OPENH323:-unset}" != "unset"; then + { echo "$as_me:$LINENO: checking OpenH323 installation validity" >&5 +echo $ECHO_N "checking OpenH323 installation validity... $ECHO_C" >&6; } + + saved_cppflags="${CPPFLAGS}" + saved_libs="${LIBS}" + if test "${OPENH323_LIB:-unset}" != "unset"; then + LIBS="${LIBS} ${OPENH323_LIB} ${PWLIB_LIB}" + else + LIBS="${LIBS} -L${OPENH323_LIBDIR} -l${PLATFORM_OPENH323} ${PWLIB_LIB}" + fi + CPPFLAGS="${CPPFLAGS} -I${OPENH323_INCDIR} ${PWLIB_INCLUDE}" + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include "ptlib.h" + #include "h323.h" + #include "h323ep.h" +int +main () +{ +H323EndPoint ep = H323EndPoint(); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + ac_cv_lib_OPENH323="yes" + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + ac_cv_lib_OPENH323="no" + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + LIBS="${saved_libs}" + CPPFLAGS="${saved_cppflags}" + + if test "${ac_cv_lib_OPENH323}" = "yes"; then + if test "${OPENH323_LIB:-undef}" = "undef"; then + if test "${OPENH323_LIBDIR}" != "" -a "${OPENH323_LIBDIR}" != "/usr/lib"; then + OPENH323_LIB="-L${OPENH323_LIBDIR} -l${PLATFORM_OPENH323}" + else + OPENH323_LIB="-l${PLATFORM_OPENH323}" + fi + fi + if test "${OPENH323_INCDIR}" != "" -a "${OPENH323_INCDIR}" != "/usr/include"; then + OPENH323_INCLUDE="-I${OPENH323_INCDIR}" + fi + PBX_OPENH323=1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_OPENH323 1 +_ACEOF + + fi + fi + +fi +if test "${USE_OPENH323}" != "no" -a "x${ac_cv_lib_OPENH323}" != "xyes" -a -n "${OPENH323_MANDATORY}"; then + { echo "$as_me:$LINENO: ***" >&5 +echo "$as_me: ***" >&6;} + { echo "$as_me:$LINENO: *** The OPENH323 installation on this system appears to be broken." >&5 +echo "$as_me: *** The OPENH323 installation on this system appears to be broken." >&6;} + { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 +echo "$as_me: *** Either correct the installation, or run configure" >&6;} + { echo "$as_me:$LINENO: *** including --without-h323" >&5 +echo "$as_me: *** including --without-h323" >&6;} + exit 1 +fi + -if test "${HAS_OPENH323:-unset}" != "unset" ; then - if test "${OPENH323_INCDIR:-unset}" = "unset"; then - OPENH323_INCDIR="${OPENH323DIR}/include" - fi - if test "${OPENH323_LIBDIR:-unset}" = "unset"; then - OPENH323_LIBDIR="${OPENH323DIR}/lib" - fi +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - OPENH323_LIBDIR="`cd ${OPENH323_LIBDIR}; pwd`" - OPENH323_INCDIR="`cd ${OPENH323_INCDIR}; pwd`" - OPENH323DIR="`cd ${OPENH323DIR}; pwd`" +if test "${USE_QT}" != "no"; then + { echo "$as_me:$LINENO: checking for QDate in -lqt" >&5 +echo $ECHO_N "checking for QDate in -lqt... $ECHO_C" >&6; } + saved_libs="${LIBS}" + saved_cppflags="${CPPFLAGS}" + if test "x${QT_DIR}" != "x"; then + LIBS="${LIBS} -L${QT_DIR}/lib" + CPPFLAGS="${CPPFLAGS} -I${QT_DIR}/include" + fi + LIBS="${LIBS} -lqt" + qtlib="qt" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +QDate date(); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_qt_qt_date="yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_qt_qt_date="no" fi +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="${saved_libs}" + CPPFLAGS="${saved_cppflags}" - if test "${HAS_OPENH323:-unset}" != "unset"; then - OPENH323_VERSION=`grep "OPENH323_VERSION" ${OPENH323_INCDIR}/openh323buildopts.h | cut -f2 -d ' ' | sed -e 's/"//g'` - OPENH323_MAJOR_VERSION=`echo ${OPENH323_VERSION} | cut -f1 -d.` - OPENH323_MINOR_VERSION=`echo ${OPENH323_VERSION} | cut -f2 -d.` - OPENH323_BUILD_NUMBER=`echo ${OPENH323_VERSION} | cut -f3 -d.` - let OPENH323_VER=${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER} - let OPENH323_REQ=1*10000+17*100+3 + if test "${ac_cv_lib_qt_qt_date}" = "no"; then + saved_libs="${LIBS}" + saved_cppflags="${CPPFLAGS}" + if test "x${QT_DIR}" != "x"; then + LIBS="${LIBS} -L${QT_DIR}/lib" + CPPFLAGS="${CPPFLAGS} -I${QT_DIR}/include" + fi + LIBS="${LIBS} -lqt-mt" + qtlib="qt-mt" + cat >conftest.$ac_ext <<_ACEOF - { echo "$as_me:$LINENO: checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323" >&5 -echo $ECHO_N "checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323... $ECHO_C" >&6; } - if test ${OPENH323_VER} -lt ${OPENH323_REQ}; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - unset HAS_OPENH323 - else - { echo "$as_me:$LINENO: result: yes" >&5 + /* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +QDate date(); + ; + return 0; +} + +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_qt_qt_date="yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_qt_qt_date="no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="${saved_libs}" + CPPFLAGS="${saved_cppflags}" + fi + + if test "${ac_cv_lib_qt_qt_date}" = "yes"; then + { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - fi - fi + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + fi + if test "${ac_cv_lib_qt_qt_date}" = "yes"; then + QT_LIB="-l${qtlib}" + if test "${QT_DIR}" != ""; then + QT_LIB="-L${QT_DIR}/lib ${QT_LIB}" + QT_INCLUDE="-I${QT_DIR}/include" + fi + PBX_QT=1 - if test "${HAS_OPENH323:-unset}" != "unset"; then - { echo "$as_me:$LINENO: checking OpenH323 build option" >&5 -echo $ECHO_N "checking OpenH323 build option... $ECHO_C" >&6; } - OPENH323_SUFFIX= - prefixes="h323_${PWLIB_PLATFORM}_ h323_ openh323" - for pfx in $prefixes; do - files=`ls -l ${OPENH323_LIBDIR}/lib${pfx}*.so* 2>/dev/null` - libfile= - if test -n "$files"; then - for f in $files; do - if test -f $f -a ! -L $f; then - libfile=`basename $f` - break; - fi - done - fi - if test -n "$libfile"; then - OPENH323_PREFIX=$pfx - break; - fi - done - if test "${libfile:-unset}" != "unset"; then - OPENH323_SUFFIX=`eval "echo ${libfile} | sed -e 's/lib${OPENH323_PREFIX}\([^.]*\)\..*/\1/'"` - fi - case "${OPENH323_SUFFIX}" in - n) - OPENH323_BUILD="notrace";; - r) - OPENH323_BUILD="opt";; - d) - OPENH323_BUILD="debug";; - *) - if test "${OPENH323_PREFIX:-undef}" = "openh323"; then - notrace=`eval "grep NOTRACE ${OPENH323DIR}/openh323u.mak | grep = | sed -e 's/[A-Z0-9_]*[ ]*=[ ]*//'"` - if test "x$notrace" = "x"; then - notrace="0" - fi - if test "$notrace" -ne 0; then - OPENH323_BUILD="notrace" - else - OPENH323_BUILD="opt" - fi - OPENH323_LIB="-l${OPENH323_PREFIX}" - else - OPENH323_BUILD="notrace" - fi - ;; - esac - { echo "$as_me:$LINENO: result: ${OPENH323_BUILD}" >&5 -echo "${ECHO_T}${OPENH323_BUILD}" >&6; } +cat >>confdefs.h <<\_ACEOF +#define HAVE_QT 1 +_ACEOF + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}moc", so it can be a program name with args. +set dummy ${ac_tool_prefix}moc; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_QTMOC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $QTMOC in + [\\/]* | ?:[\\/]*) + ac_cv_path_QTMOC="$QTMOC" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_QTMOC="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + ;; +esac +fi +QTMOC=$ac_cv_path_QTMOC +if test -n "$QTMOC"; then + { echo "$as_me:$LINENO: result: $QTMOC" >&5 +echo "${ECHO_T}$QTMOC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi - fi +fi +if test -z "$ac_cv_path_QTMOC"; then + ac_pt_QTMOC=$QTMOC + # Extract the first word of "moc", so it can be a program name with args. +set dummy moc; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_QTMOC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_QTMOC in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_QTMOC="$ac_pt_QTMOC" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_QTMOC="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}" + ;; +esac +fi +ac_pt_QTMOC=$ac_cv_path_ac_pt_QTMOC +if test -n "$ac_pt_QTMOC"; then + { echo "$as_me:$LINENO: result: $ac_pt_QTMOC" >&5 +echo "${ECHO_T}$ac_pt_QTMOC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi - if test "${HAS_OPENH323:-unset}" != "unset"; then - { echo "$as_me:$LINENO: checking OpenH323 installation validity" >&5 -echo $ECHO_N "checking OpenH323 installation validity... $ECHO_C" >&6; } + if test "x$ac_pt_QTMOC" = x; then + QTMOC="No" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + QTMOC=$ac_pt_QTMOC + fi +else + QTMOC="$ac_cv_path_QTMOC" +fi - saved_cppflags="${CPPFLAGS}" - saved_libs="${LIBS}" - if test "${OPENH323_LIB:-unset}" != "unset"; then - LIBS="${LIBS} ${OPENH323_LIB} ${PWLIB_LIB}" - else - LIBS="${LIBS} -L${OPENH323_LIBDIR} -l${PLATFORM_OPENH323} ${PWLIB_LIB}" - fi - CPPFLAGS="${CPPFLAGS} -I${OPENH323_INCDIR} ${PWLIB_INCLUDE}" + elif test -n "${QT_MANDATORY}"; + then + { echo "$as_me:$LINENO: ***" >&5 +echo "$as_me: ***" >&6;} + { echo "$as_me:$LINENO: *** The Qt installation on this system appears to be broken." >&5 +echo "$as_me: *** The Qt installation on this system appears to be broken." >&6;} + { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 +echo "$as_me: *** Either correct the installation, or run configure" >&6;} + { echo "$as_me:$LINENO: *** including --without-qt." >&5 +echo "$as_me: *** including --without-qt." >&6;} + exit 1 + fi +fi - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF + +if test "${USE_RADIUS}" != "no"; then + pbxlibdir="" + if test "x${RADIUS_DIR}" != "x"; then + if test -d ${RADIUS_DIR}/lib; then + pbxlibdir="-L${RADIUS_DIR}/lib" + else + pbxlibdir="-L${RADIUS_DIR}" + fi + fi + { echo "$as_me:$LINENO: checking for rc_read_config in -lradiusclient-ng" >&5 +echo $ECHO_N "checking for rc_read_config in -lradiusclient-ng... $ECHO_C" >&6; } +if test "${ac_cv_lib_radiusclient_ng_rc_read_config+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lradiusclient-ng ${pbxlibdir} $LIBS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include "ptlib.h" - #include "h323.h" - #include "h323ep.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 rc_read_config (); int main () { -H323EndPoint ep = H323EndPoint(); +return rc_read_config (); ; return 0; } @@ -25332,356 +25316,369 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - ac_cv_lib_OPENH323="yes" - + ac_cv_lib_radiusclient_ng_rc_read_config=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - ac_cv_lib_OPENH323="no" - - + ac_cv_lib_radiusclient_ng_rc_read_config=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_radiusclient_ng_rc_read_config" >&5 +echo "${ECHO_T}$ac_cv_lib_radiusclient_ng_rc_read_config" >&6; } +if test $ac_cv_lib_radiusclient_ng_rc_read_config = yes; then + AST_RADIUS_FOUND=yes +else + AST_RADIUS_FOUND=no +fi - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "${AST_RADIUS_FOUND}" = "yes"; then + RADIUS_LIB="-lradiusclient-ng " + RADIUS_HEADER_FOUND="1" + if test "x${RADIUS_DIR}" != "x"; then + RADIUS_LIB="${pbxlibdir} ${RADIUS_LIB}" + RADIUS_INCLUDE="-I${RADIUS_DIR}/include" + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} -I${RADIUS_DIR}/include" + if test "xradiusclient-ng.h" != "x" ; then + as_ac_Header=`echo "ac_cv_header_${RADIUS_DIR}/include/radiusclient-ng.h" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for ${RADIUS_DIR}/include/radiusclient-ng.h" >&5 +echo $ECHO_N "checking for ${RADIUS_DIR}/include/radiusclient-ng.h... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking ${RADIUS_DIR}/include/radiusclient-ng.h usability" >&5 +echo $ECHO_N "checking ${RADIUS_DIR}/include/radiusclient-ng.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <${RADIUS_DIR}/include/radiusclient-ng.h> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking ${RADIUS_DIR}/include/radiusclient-ng.h presence" >&5 +echo $ECHO_N "checking ${RADIUS_DIR}/include/radiusclient-ng.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <${RADIUS_DIR}/include/radiusclient-ng.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - LIBS="${saved_libs}" - CPPFLAGS="${saved_cppflags}" + ac_header_preproc=no +fi - if test "${ac_cv_lib_OPENH323}" = "yes"; then - if test "${OPENH323_LIB:-undef}" = "undef"; then - if test "${OPENH323_LIBDIR}" != "" -a "${OPENH323_LIBDIR}" != "/usr/lib"; then - OPENH323_LIB="-L${OPENH323_LIBDIR} -l${PLATFORM_OPENH323}" - else - OPENH323_LIB="-l${PLATFORM_OPENH323}" - fi - fi - if test "${OPENH323_INCDIR}" != "" -a "${OPENH323_INCDIR}" != "/usr/include"; then - OPENH323_INCLUDE="-I${OPENH323_INCDIR}" - fi - PBX_OPENH323=1 +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_OPENH323 1 -_ACEOF +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: in the future, the compiler will take precedence" >&2;} - fi - fi + ;; +esac +{ echo "$as_me:$LINENO: checking for ${RADIUS_DIR}/include/radiusclient-ng.h" >&5 +echo $ECHO_N "checking for ${RADIUS_DIR}/include/radiusclient-ng.h... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi -if test "${USE_OPENH323}" != "no" -a "x${ac_cv_lib_OPENH323}" != "xyes" -a -n "${OPENH323_MANDATORY}"; then - { echo "$as_me:$LINENO: ***" >&5 -echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** The OPENH323 installation on this system appears to be broken." >&5 -echo "$as_me: *** The OPENH323 installation on this system appears to be broken." >&6;} - { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 -echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** including --without-h323" >&5 -echo "$as_me: *** including --without-h323" >&6;} - exit 1 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + RADIUS_HEADER_FOUND=1 +else + RADIUS_HEADER_FOUND=0 fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -if test "${USE_QT}" != "no"; then - { echo "$as_me:$LINENO: checking for QDate in -lqt" >&5 -echo $ECHO_N "checking for QDate in -lqt... $ECHO_C" >&6; } - saved_libs="${LIBS}" - saved_cppflags="${CPPFLAGS}" - if test "x${QT_DIR}" != "x"; then - LIBS="${LIBS} -L${QT_DIR}/lib" - CPPFLAGS="${CPPFLAGS} -I${QT_DIR}/include" - fi - LIBS="${LIBS} -lqt" - qtlib="qt" - cat >conftest.$ac_ext <<_ACEOF - - /* confdefs.h. */ + fi + CPPFLAGS="${saved_cppflags}" + else + if test "xradiusclient-ng.h" != "x" ; then + if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then + { echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 +echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } +if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 +echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking radiusclient-ng.h usability" >&5 +echo $ECHO_N "checking radiusclient-ng.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -int -main () -{ -QDate date(); - ; - return 0; -} - +$ac_includes_default +#include _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_qt_qt_date="yes" + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_qt_qt_date="no" + ac_header_compiler=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="${saved_libs}" - CPPFLAGS="${saved_cppflags}" - - if test "${ac_cv_lib_qt_qt_date}" = "no"; then - saved_libs="${LIBS}" - saved_cppflags="${CPPFLAGS}" - if test "x${QT_DIR}" != "x"; then - LIBS="${LIBS} -L${QT_DIR}/lib" - CPPFLAGS="${CPPFLAGS} -I${QT_DIR}/include" - fi - LIBS="${LIBS} -lqt-mt" - qtlib="qt-mt" - cat >conftest.$ac_ext <<_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } - /* confdefs.h. */ +# Is the header present? +{ echo "$as_me:$LINENO: checking radiusclient-ng.h presence" >&5 +echo $ECHO_N "checking radiusclient-ng.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -int -main () -{ -QDate date(); - ; - return 0; -} - +#include _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_qt_qt_date="yes" + }; then + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_qt_qt_date="no" + ac_header_preproc=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="${saved_libs}" - CPPFLAGS="${saved_cppflags}" - fi - - if test "${ac_cv_lib_qt_qt_date}" = "yes"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi - - if test "${ac_cv_lib_qt_qt_date}" = "yes"; then - QT_LIB="-l${qtlib}" - if test "${QT_DIR}" != ""; then - QT_LIB="-L${QT_DIR}/lib ${QT_LIB}" - QT_INCLUDE="-I${QT_DIR}/include" - fi - PBX_QT=1 - -cat >>confdefs.h <<\_ACEOF -#define HAVE_QT 1 -_ACEOF +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}moc", so it can be a program name with args. -set dummy ${ac_tool_prefix}moc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_QTMOC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $QTMOC in - [\\/]* | ?:[\\/]*) - ac_cv_path_QTMOC="$QTMOC" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_QTMOC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&2;} - ;; + ;; esac -fi -QTMOC=$ac_cv_path_QTMOC -if test -n "$QTMOC"; then - { echo "$as_me:$LINENO: result: $QTMOC" >&5 -echo "${ECHO_T}$QTMOC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_QTMOC"; then - ac_pt_QTMOC=$QTMOC - # Extract the first word of "moc", so it can be a program name with args. -set dummy moc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_QTMOC+set}" = set; then +{ echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 +echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } +if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $ac_pt_QTMOC in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_QTMOC="$ac_pt_QTMOC" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_QTMOC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + ac_cv_header_radiusclient_ng_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 +echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } - ;; -esac fi -ac_pt_QTMOC=$ac_cv_path_ac_pt_QTMOC -if test -n "$ac_pt_QTMOC"; then - { echo "$as_me:$LINENO: result: $ac_pt_QTMOC" >&5 -echo "${ECHO_T}$ac_pt_QTMOC" >&6; } +if test $ac_cv_header_radiusclient_ng_h = yes; then + RADIUS_HEADER_FOUND=1 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + RADIUS_HEADER_FOUND=0 fi - if test "x$ac_pt_QTMOC" = x; then - QTMOC="No" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - QTMOC=$ac_pt_QTMOC - fi -else - QTMOC="$ac_cv_path_QTMOC" -fi - elif test -n "${QT_MANDATORY}"; + fi + fi + if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then + if test -n "${RADIUS_MANDATORY}" ; + then + { echo "$as_me:$LINENO: ***" >&5 +echo "$as_me: ***" >&6;} + { echo "$as_me:$LINENO: *** It appears that you do not have the radiusclient-ng development package installed." >&5 +echo "$as_me: *** It appears that you do not have the radiusclient-ng development package installed." >&6;} + { echo "$as_me:$LINENO: *** Please install it to include ${RADIUS_DESCRIP} support, or re-run configure" >&5 +echo "$as_me: *** Please install it to include ${RADIUS_DESCRIP} support, or re-run configure" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${RADIUS_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${RADIUS_OPTION}" >&6;} + exit 1 + fi + RADIUS_LIB="" + RADIUS_INCLUDE="" + PBX_RADIUS=0 + else + PBX_RADIUS=1 + +cat >>confdefs.h <<_ACEOF +#define HAVE_RADIUS 1 +_ACEOF + + fi + elif test -n "${RADIUS_MANDATORY}"; then { echo "$as_me:$LINENO: ***" >&5 echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** The Qt installation on this system appears to be broken." >&5 -echo "$as_me: *** The Qt installation on this system appears to be broken." >&6;} + { echo "$as_me:$LINENO: *** The ${RADIUS_DESCRIP} installation on this system appears to be broken." >&5 +echo "$as_me: *** The ${RADIUS_DESCRIP} installation on this system appears to be broken." >&6;} { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** including --without-qt." >&5 -echo "$as_me: *** including --without-qt." >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${RADIUS_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${RADIUS_OPTION}" >&6;} exit 1 fi fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -if test "${USE_RADIUS}" != "no"; then +if test "${USE_SPEEX}" != "no"; then pbxlibdir="" - if test "x${RADIUS_DIR}" != "x"; then - if test -d ${RADIUS_DIR}/lib; then - pbxlibdir="-L${RADIUS_DIR}/lib" + if test "x${SPEEX_DIR}" != "x"; then + if test -d ${SPEEX_DIR}/lib; then + pbxlibdir="-L${SPEEX_DIR}/lib" else - pbxlibdir="-L${RADIUS_DIR}" + pbxlibdir="-L${SPEEX_DIR}" fi fi - { echo "$as_me:$LINENO: checking for rc_read_config in -lradiusclient-ng" >&5 -echo $ECHO_N "checking for rc_read_config in -lradiusclient-ng... $ECHO_C" >&6; } -if test "${ac_cv_lib_radiusclient_ng_rc_read_config+set}" = set; then + { echo "$as_me:$LINENO: checking for speex_encode in -lspeex" >&5 +echo $ECHO_N "checking for speex_encode in -lspeex... $ECHO_C" >&6; } +if test "${ac_cv_lib_speex_speex_encode+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lradiusclient-ng ${pbxlibdir} $LIBS" +LIBS="-lspeex ${pbxlibdir} -lm $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25695,11 +25692,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char rc_read_config (); +char speex_encode (); int main () { -return rc_read_config (); +return speex_encode (); ; return 0; } @@ -25722,40 +25719,40 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_radiusclient_ng_rc_read_config=yes + ac_cv_lib_speex_speex_encode=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_radiusclient_ng_rc_read_config=no + ac_cv_lib_speex_speex_encode=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_radiusclient_ng_rc_read_config" >&5 -echo "${ECHO_T}$ac_cv_lib_radiusclient_ng_rc_read_config" >&6; } -if test $ac_cv_lib_radiusclient_ng_rc_read_config = yes; then - AST_RADIUS_FOUND=yes +{ echo "$as_me:$LINENO: result: $ac_cv_lib_speex_speex_encode" >&5 +echo "${ECHO_T}$ac_cv_lib_speex_speex_encode" >&6; } +if test $ac_cv_lib_speex_speex_encode = yes; then + AST_SPEEX_FOUND=yes else - AST_RADIUS_FOUND=no + AST_SPEEX_FOUND=no fi - if test "${AST_RADIUS_FOUND}" = "yes"; then - RADIUS_LIB="-lradiusclient-ng " - RADIUS_HEADER_FOUND="1" - if test "x${RADIUS_DIR}" != "x"; then - RADIUS_LIB="${pbxlibdir} ${RADIUS_LIB}" - RADIUS_INCLUDE="-I${RADIUS_DIR}/include" + if test "${AST_SPEEX_FOUND}" = "yes"; then + SPEEX_LIB="-lspeex -lm" + SPEEX_HEADER_FOUND="1" + if test "x${SPEEX_DIR}" != "x"; then + SPEEX_LIB="${pbxlibdir} ${SPEEX_LIB}" + SPEEX_INCLUDE="-I${SPEEX_DIR}/include" saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} -I${RADIUS_DIR}/include" - if test "xradiusclient-ng.h" != "x" ; then - as_ac_Header=`echo "ac_cv_header_${RADIUS_DIR}/include/radiusclient-ng.h" | $as_tr_sh` + CPPFLAGS="${CPPFLAGS} -I${SPEEX_DIR}/include" + if test "xspeex/speex.h" != "x" ; then + as_ac_Header=`echo "ac_cv_header_${SPEEX_DIR}/include/speex/speex.h" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for ${RADIUS_DIR}/include/radiusclient-ng.h" >&5 -echo $ECHO_N "checking for ${RADIUS_DIR}/include/radiusclient-ng.h... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for ${SPEEX_DIR}/include/speex/speex.h" >&5 +echo $ECHO_N "checking for ${SPEEX_DIR}/include/speex/speex.h... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi @@ -25764,8 +25761,8 @@ ac_res=`eval echo '${'$as_ac_Header'}'` echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${RADIUS_DIR}/include/radiusclient-ng.h usability" >&5 -echo $ECHO_N "checking ${RADIUS_DIR}/include/radiusclient-ng.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ${SPEEX_DIR}/include/speex/speex.h usability" >&5 +echo $ECHO_N "checking ${SPEEX_DIR}/include/speex/speex.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25773,7 +25770,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <${RADIUS_DIR}/include/radiusclient-ng.h> +#include <${SPEEX_DIR}/include/speex/speex.h> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -25805,15 +25802,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking ${RADIUS_DIR}/include/radiusclient-ng.h presence" >&5 -echo $ECHO_N "checking ${RADIUS_DIR}/include/radiusclient-ng.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ${SPEEX_DIR}/include/speex/speex.h presence" >&5 +echo $ECHO_N "checking ${SPEEX_DIR}/include/speex/speex.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <${RADIUS_DIR}/include/radiusclient-ng.h> +#include <${SPEEX_DIR}/include/speex/speex.h> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -25846,30 +25843,30 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${RADIUS_DIR}/include/radiusclient-ng.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for ${RADIUS_DIR}/include/radiusclient-ng.h" >&5 -echo $ECHO_N "checking for ${RADIUS_DIR}/include/radiusclient-ng.h... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking for ${SPEEX_DIR}/include/speex/speex.h" >&5 +echo $ECHO_N "checking for ${SPEEX_DIR}/include/speex/speex.h... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25881,28 +25878,28 @@ echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - RADIUS_HEADER_FOUND=1 + SPEEX_HEADER_FOUND=1 else - RADIUS_HEADER_FOUND=0 + SPEEX_HEADER_FOUND=0 fi fi CPPFLAGS="${saved_cppflags}" else - if test "xradiusclient-ng.h" != "x" ; then - if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then - { echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 -echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } -if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then + if test "xspeex/speex.h" != "x" ; then + if test "${ac_cv_header_speex_speex_h+set}" = set; then + { echo "$as_me:$LINENO: checking for speex/speex.h" >&5 +echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; } +if test "${ac_cv_header_speex_speex_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 -echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_speex_speex_h" >&5 +echo "${ECHO_T}$ac_cv_header_speex_speex_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking radiusclient-ng.h usability" >&5 -echo $ECHO_N "checking radiusclient-ng.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking speex/speex.h usability" >&5 +echo $ECHO_N "checking speex/speex.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25910,7 +25907,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -25942,15 +25939,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking radiusclient-ng.h presence" >&5 -echo $ECHO_N "checking radiusclient-ng.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking speex/speex.h presence" >&5 +echo $ECHO_N "checking speex/speex.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -25983,104 +25980,104 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: speex/speex.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: speex/speex.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: speex/speex.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: speex/speex.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: speex/speex.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: speex/speex.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: speex/speex.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: speex/speex.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: speex/speex.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: speex/speex.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: speex/speex.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: speex/speex.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: speex/speex.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: speex/speex.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 -echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } -if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for speex/speex.h" >&5 +echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; } +if test "${ac_cv_header_speex_speex_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_radiusclient_ng_h=$ac_header_preproc + ac_cv_header_speex_speex_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 -echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_speex_speex_h" >&5 +echo "${ECHO_T}$ac_cv_header_speex_speex_h" >&6; } fi -if test $ac_cv_header_radiusclient_ng_h = yes; then - RADIUS_HEADER_FOUND=1 +if test $ac_cv_header_speex_speex_h = yes; then + SPEEX_HEADER_FOUND=1 else - RADIUS_HEADER_FOUND=0 + SPEEX_HEADER_FOUND=0 fi fi fi - if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then - if test -n "${RADIUS_MANDATORY}" ; + if test "x${SPEEX_HEADER_FOUND}" = "x0" ; then + if test -n "${SPEEX_MANDATORY}" ; then { echo "$as_me:$LINENO: ***" >&5 echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** It appears that you do not have the radiusclient-ng development package installed." >&5 -echo "$as_me: *** It appears that you do not have the radiusclient-ng development package installed." >&6;} - { echo "$as_me:$LINENO: *** Please install it to include ${RADIUS_DESCRIP} support, or re-run configure" >&5 -echo "$as_me: *** Please install it to include ${RADIUS_DESCRIP} support, or re-run configure" >&6;} - { echo "$as_me:$LINENO: *** without explicitly specifying --with-${RADIUS_OPTION}" >&5 -echo "$as_me: *** without explicitly specifying --with-${RADIUS_OPTION}" >&6;} + { echo "$as_me:$LINENO: *** It appears that you do not have the speex development package installed." >&5 +echo "$as_me: *** It appears that you do not have the speex development package installed." >&6;} + { echo "$as_me:$LINENO: *** Please install it to include ${SPEEX_DESCRIP} support, or re-run configure" >&5 +echo "$as_me: *** Please install it to include ${SPEEX_DESCRIP} support, or re-run configure" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEX_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${SPEEX_OPTION}" >&6;} exit 1 fi - RADIUS_LIB="" - RADIUS_INCLUDE="" - PBX_RADIUS=0 + SPEEX_LIB="" + SPEEX_INCLUDE="" + PBX_SPEEX=0 else - PBX_RADIUS=1 + PBX_SPEEX=1 cat >>confdefs.h <<_ACEOF -#define HAVE_RADIUS 1 +#define HAVE_SPEEX 1 _ACEOF fi - elif test -n "${RADIUS_MANDATORY}"; + elif test -n "${SPEEX_MANDATORY}"; then { echo "$as_me:$LINENO: ***" >&5 echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** The ${RADIUS_DESCRIP} installation on this system appears to be broken." >&5 -echo "$as_me: *** The ${RADIUS_DESCRIP} installation on this system appears to be broken." >&6;} + { echo "$as_me:$LINENO: *** The ${SPEEX_DESCRIP} installation on this system appears to be broken." >&5 +echo "$as_me: *** The ${SPEEX_DESCRIP} installation on this system appears to be broken." >&6;} { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** without explicitly specifying --with-${RADIUS_OPTION}" >&5 -echo "$as_me: *** without explicitly specifying --with-${RADIUS_OPTION}" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEX_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${SPEEX_OPTION}" >&6;} exit 1 fi fi -if test "${USE_SPEEX}" != "no"; then +if test "${USE_SQLITE}" != "no"; then pbxlibdir="" - if test "x${SPEEX_DIR}" != "x"; then - if test -d ${SPEEX_DIR}/lib; then - pbxlibdir="-L${SPEEX_DIR}/lib" + if test "x${SQLITE_DIR}" != "x"; then + if test -d ${SQLITE_DIR}/lib; then + pbxlibdir="-L${SQLITE_DIR}/lib" else - pbxlibdir="-L${SPEEX_DIR}" + pbxlibdir="-L${SQLITE_DIR}" fi fi - { echo "$as_me:$LINENO: checking for speex_encode in -lspeex" >&5 -echo $ECHO_N "checking for speex_encode in -lspeex... $ECHO_C" >&6; } -if test "${ac_cv_lib_speex_speex_encode+set}" = set; then + { echo "$as_me:$LINENO: checking for sqlite_exec in -lsqlite" >&5 +echo $ECHO_N "checking for sqlite_exec in -lsqlite... $ECHO_C" >&6; } +if test "${ac_cv_lib_sqlite_sqlite_exec+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lspeex ${pbxlibdir} -lm $LIBS" +LIBS="-lsqlite ${pbxlibdir} $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26094,11 +26091,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char speex_encode (); +char sqlite_exec (); int main () { -return speex_encode (); +return sqlite_exec (); ; return 0; } @@ -26121,40 +26118,40 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_speex_speex_encode=yes + ac_cv_lib_sqlite_sqlite_exec=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_speex_speex_encode=no + ac_cv_lib_sqlite_sqlite_exec=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_speex_speex_encode" >&5 -echo "${ECHO_T}$ac_cv_lib_speex_speex_encode" >&6; } -if test $ac_cv_lib_speex_speex_encode = yes; then - AST_SPEEX_FOUND=yes +{ echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_exec" >&5 +echo "${ECHO_T}$ac_cv_lib_sqlite_sqlite_exec" >&6; } +if test $ac_cv_lib_sqlite_sqlite_exec = yes; then + AST_SQLITE_FOUND=yes else - AST_SPEEX_FOUND=no + AST_SQLITE_FOUND=no fi - if test "${AST_SPEEX_FOUND}" = "yes"; then - SPEEX_LIB="-lspeex -lm" - SPEEX_HEADER_FOUND="1" - if test "x${SPEEX_DIR}" != "x"; then - SPEEX_LIB="${pbxlibdir} ${SPEEX_LIB}" - SPEEX_INCLUDE="-I${SPEEX_DIR}/include" + if test "${AST_SQLITE_FOUND}" = "yes"; then + SQLITE_LIB="-lsqlite " + SQLITE_HEADER_FOUND="1" + if test "x${SQLITE_DIR}" != "x"; then + SQLITE_LIB="${pbxlibdir} ${SQLITE_LIB}" + SQLITE_INCLUDE="-I${SQLITE_DIR}/include" saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} -I${SPEEX_DIR}/include" - if test "xspeex/speex.h" != "x" ; then - as_ac_Header=`echo "ac_cv_header_${SPEEX_DIR}/include/speex/speex.h" | $as_tr_sh` + CPPFLAGS="${CPPFLAGS} -I${SQLITE_DIR}/include" + if test "xsqlite.h" != "x" ; then + as_ac_Header=`echo "ac_cv_header_${SQLITE_DIR}/include/sqlite.h" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for ${SPEEX_DIR}/include/speex/speex.h" >&5 -echo $ECHO_N "checking for ${SPEEX_DIR}/include/speex/speex.h... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for ${SQLITE_DIR}/include/sqlite.h" >&5 +echo $ECHO_N "checking for ${SQLITE_DIR}/include/sqlite.h... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi @@ -26163,8 +26160,8 @@ ac_res=`eval echo '${'$as_ac_Header'}'` echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${SPEEX_DIR}/include/speex/speex.h usability" >&5 -echo $ECHO_N "checking ${SPEEX_DIR}/include/speex/speex.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ${SQLITE_DIR}/include/sqlite.h usability" >&5 +echo $ECHO_N "checking ${SQLITE_DIR}/include/sqlite.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26172,7 +26169,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <${SPEEX_DIR}/include/speex/speex.h> +#include <${SQLITE_DIR}/include/sqlite.h> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -26204,15 +26201,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking ${SPEEX_DIR}/include/speex/speex.h presence" >&5 -echo $ECHO_N "checking ${SPEEX_DIR}/include/speex/speex.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ${SQLITE_DIR}/include/sqlite.h presence" >&5 +echo $ECHO_N "checking ${SQLITE_DIR}/include/sqlite.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <${SPEEX_DIR}/include/speex/speex.h> +#include <${SQLITE_DIR}/include/sqlite.h> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -26245,30 +26242,30 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for ${SPEEX_DIR}/include/speex/speex.h" >&5 -echo $ECHO_N "checking for ${SPEEX_DIR}/include/speex/speex.h... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking for ${SQLITE_DIR}/include/sqlite.h" >&5 +echo $ECHO_N "checking for ${SQLITE_DIR}/include/sqlite.h... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26280,28 +26277,28 @@ echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - SPEEX_HEADER_FOUND=1 + SQLITE_HEADER_FOUND=1 else - SPEEX_HEADER_FOUND=0 + SQLITE_HEADER_FOUND=0 fi fi CPPFLAGS="${saved_cppflags}" else - if test "xspeex/speex.h" != "x" ; then - if test "${ac_cv_header_speex_speex_h+set}" = set; then - { echo "$as_me:$LINENO: checking for speex/speex.h" >&5 -echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; } -if test "${ac_cv_header_speex_speex_h+set}" = set; then + if test "xsqlite.h" != "x" ; then + if test "${ac_cv_header_sqlite_h+set}" = set; then + { echo "$as_me:$LINENO: checking for sqlite.h" >&5 +echo $ECHO_N "checking for sqlite.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sqlite_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_speex_speex_h" >&5 -echo "${ECHO_T}$ac_cv_header_speex_speex_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sqlite_h" >&5 +echo "${ECHO_T}$ac_cv_header_sqlite_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking speex/speex.h usability" >&5 -echo $ECHO_N "checking speex/speex.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking sqlite.h usability" >&5 +echo $ECHO_N "checking sqlite.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26309,7 +26306,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -26341,15 +26338,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking speex/speex.h presence" >&5 -echo $ECHO_N "checking speex/speex.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking sqlite.h presence" >&5 +echo $ECHO_N "checking sqlite.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -26382,104 +26379,104 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: speex/speex.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlite.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sqlite.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlite.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sqlite.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: speex/speex.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: speex/speex.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: speex/speex.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: speex/speex.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: speex/speex.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: speex/speex.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: speex/speex.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlite.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sqlite.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlite.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sqlite.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlite.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sqlite.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlite.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sqlite.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlite.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sqlite.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlite.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sqlite.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for speex/speex.h" >&5 -echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; } -if test "${ac_cv_header_speex_speex_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for sqlite.h" >&5 +echo $ECHO_N "checking for sqlite.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sqlite_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_speex_speex_h=$ac_header_preproc + ac_cv_header_sqlite_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_speex_speex_h" >&5 -echo "${ECHO_T}$ac_cv_header_speex_speex_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sqlite_h" >&5 +echo "${ECHO_T}$ac_cv_header_sqlite_h" >&6; } fi -if test $ac_cv_header_speex_speex_h = yes; then - SPEEX_HEADER_FOUND=1 +if test $ac_cv_header_sqlite_h = yes; then + SQLITE_HEADER_FOUND=1 else - SPEEX_HEADER_FOUND=0 + SQLITE_HEADER_FOUND=0 fi fi fi - if test "x${SPEEX_HEADER_FOUND}" = "x0" ; then - if test -n "${SPEEX_MANDATORY}" ; + if test "x${SQLITE_HEADER_FOUND}" = "x0" ; then + if test -n "${SQLITE_MANDATORY}" ; then { echo "$as_me:$LINENO: ***" >&5 echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** It appears that you do not have the speex development package installed." >&5 -echo "$as_me: *** It appears that you do not have the speex development package installed." >&6;} - { echo "$as_me:$LINENO: *** Please install it to include ${SPEEX_DESCRIP} support, or re-run configure" >&5 -echo "$as_me: *** Please install it to include ${SPEEX_DESCRIP} support, or re-run configure" >&6;} - { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEX_OPTION}" >&5 -echo "$as_me: *** without explicitly specifying --with-${SPEEX_OPTION}" >&6;} + { echo "$as_me:$LINENO: *** It appears that you do not have the sqlite development package installed." >&5 +echo "$as_me: *** It appears that you do not have the sqlite development package installed." >&6;} + { echo "$as_me:$LINENO: *** Please install it to include ${SQLITE_DESCRIP} support, or re-run configure" >&5 +echo "$as_me: *** Please install it to include ${SQLITE_DESCRIP} support, or re-run configure" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SQLITE_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${SQLITE_OPTION}" >&6;} exit 1 fi - SPEEX_LIB="" - SPEEX_INCLUDE="" - PBX_SPEEX=0 + SQLITE_LIB="" + SQLITE_INCLUDE="" + PBX_SQLITE=0 else - PBX_SPEEX=1 + PBX_SQLITE=1 cat >>confdefs.h <<_ACEOF -#define HAVE_SPEEX 1 +#define HAVE_SQLITE 1 _ACEOF fi - elif test -n "${SPEEX_MANDATORY}"; + elif test -n "${SQLITE_MANDATORY}"; then { echo "$as_me:$LINENO: ***" >&5 echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** The ${SPEEX_DESCRIP} installation on this system appears to be broken." >&5 -echo "$as_me: *** The ${SPEEX_DESCRIP} installation on this system appears to be broken." >&6;} + { echo "$as_me:$LINENO: *** The ${SQLITE_DESCRIP} installation on this system appears to be broken." >&5 +echo "$as_me: *** The ${SQLITE_DESCRIP} installation on this system appears to be broken." >&6;} { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEX_OPTION}" >&5 -echo "$as_me: *** without explicitly specifying --with-${SPEEX_OPTION}" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SQLITE_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${SQLITE_OPTION}" >&6;} exit 1 fi fi -if test "${USE_SQLITE}" != "no"; then +if test "${USE_OPENSSL}" != "no"; then pbxlibdir="" - if test "x${SQLITE_DIR}" != "x"; then - if test -d ${SQLITE_DIR}/lib; then - pbxlibdir="-L${SQLITE_DIR}/lib" + if test "x${OPENSSL_DIR}" != "x"; then + if test -d ${OPENSSL_DIR}/lib; then + pbxlibdir="-L${OPENSSL_DIR}/lib" else - pbxlibdir="-L${SQLITE_DIR}" + pbxlibdir="-L${OPENSSL_DIR}" fi fi - { echo "$as_me:$LINENO: checking for sqlite_exec in -lsqlite" >&5 -echo $ECHO_N "checking for sqlite_exec in -lsqlite... $ECHO_C" >&6; } -if test "${ac_cv_lib_sqlite_sqlite_exec+set}" = set; then + { echo "$as_me:$LINENO: checking for ssl2_connect in -lssl" >&5 +echo $ECHO_N "checking for ssl2_connect in -lssl... $ECHO_C" >&6; } +if test "${ac_cv_lib_ssl_ssl2_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lsqlite ${pbxlibdir} $LIBS" +LIBS="-lssl ${pbxlibdir} -lcrypto $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26493,11 +26490,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char sqlite_exec (); +char ssl2_connect (); int main () { -return sqlite_exec (); +return ssl2_connect (); ; return 0; } @@ -26520,40 +26517,40 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_sqlite_sqlite_exec=yes + ac_cv_lib_ssl_ssl2_connect=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_sqlite_sqlite_exec=no + ac_cv_lib_ssl_ssl2_connect=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_exec" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite_sqlite_exec" >&6; } -if test $ac_cv_lib_sqlite_sqlite_exec = yes; then - AST_SQLITE_FOUND=yes +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_ssl2_connect" >&5 +echo "${ECHO_T}$ac_cv_lib_ssl_ssl2_connect" >&6; } +if test $ac_cv_lib_ssl_ssl2_connect = yes; then + AST_OPENSSL_FOUND=yes else - AST_SQLITE_FOUND=no + AST_OPENSSL_FOUND=no fi - if test "${AST_SQLITE_FOUND}" = "yes"; then - SQLITE_LIB="-lsqlite " - SQLITE_HEADER_FOUND="1" - if test "x${SQLITE_DIR}" != "x"; then - SQLITE_LIB="${pbxlibdir} ${SQLITE_LIB}" - SQLITE_INCLUDE="-I${SQLITE_DIR}/include" + if test "${AST_OPENSSL_FOUND}" = "yes"; then + OPENSSL_LIB="-lssl -lcrypto" + OPENSSL_HEADER_FOUND="1" + if test "x${OPENSSL_DIR}" != "x"; then + OPENSSL_LIB="${pbxlibdir} ${OPENSSL_LIB}" + OPENSSL_INCLUDE="-I${OPENSSL_DIR}/include" saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} -I${SQLITE_DIR}/include" - if test "xsqlite.h" != "x" ; then - as_ac_Header=`echo "ac_cv_header_${SQLITE_DIR}/include/sqlite.h" | $as_tr_sh` + CPPFLAGS="${CPPFLAGS} -I${OPENSSL_DIR}/include" + if test "xopenssl/ssl.h" != "x" ; then + as_ac_Header=`echo "ac_cv_header_${OPENSSL_DIR}/include/openssl/ssl.h" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for ${SQLITE_DIR}/include/sqlite.h" >&5 -echo $ECHO_N "checking for ${SQLITE_DIR}/include/sqlite.h... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for ${OPENSSL_DIR}/include/openssl/ssl.h" >&5 +echo $ECHO_N "checking for ${OPENSSL_DIR}/include/openssl/ssl.h... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi @@ -26562,8 +26559,8 @@ ac_res=`eval echo '${'$as_ac_Header'}'` echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${SQLITE_DIR}/include/sqlite.h usability" >&5 -echo $ECHO_N "checking ${SQLITE_DIR}/include/sqlite.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ${OPENSSL_DIR}/include/openssl/ssl.h usability" >&5 +echo $ECHO_N "checking ${OPENSSL_DIR}/include/openssl/ssl.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26571,7 +26568,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <${SQLITE_DIR}/include/sqlite.h> +#include <${OPENSSL_DIR}/include/openssl/ssl.h> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -26603,15 +26600,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking ${SQLITE_DIR}/include/sqlite.h presence" >&5 -echo $ECHO_N "checking ${SQLITE_DIR}/include/sqlite.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ${OPENSSL_DIR}/include/openssl/ssl.h presence" >&5 +echo $ECHO_N "checking ${OPENSSL_DIR}/include/openssl/ssl.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <${SQLITE_DIR}/include/sqlite.h> +#include <${OPENSSL_DIR}/include/openssl/ssl.h> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -26644,30 +26641,30 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for ${SQLITE_DIR}/include/sqlite.h" >&5 -echo $ECHO_N "checking for ${SQLITE_DIR}/include/sqlite.h... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking for ${OPENSSL_DIR}/include/openssl/ssl.h" >&5 +echo $ECHO_N "checking for ${OPENSSL_DIR}/include/openssl/ssl.h... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26679,28 +26676,28 @@ echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - SQLITE_HEADER_FOUND=1 + OPENSSL_HEADER_FOUND=1 else - SQLITE_HEADER_FOUND=0 + OPENSSL_HEADER_FOUND=0 fi fi CPPFLAGS="${saved_cppflags}" else - if test "xsqlite.h" != "x" ; then - if test "${ac_cv_header_sqlite_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sqlite.h" >&5 -echo $ECHO_N "checking for sqlite.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sqlite_h+set}" = set; then + if test "xopenssl/ssl.h" != "x" ; then + if test "${ac_cv_header_openssl_ssl_h+set}" = set; then + { echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5 +echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; } +if test "${ac_cv_header_openssl_ssl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sqlite_h" >&5 -echo "${ECHO_T}$ac_cv_header_sqlite_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5 +echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking sqlite.h usability" >&5 -echo $ECHO_N "checking sqlite.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking openssl/ssl.h usability" >&5 +echo $ECHO_N "checking openssl/ssl.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26708,7 +26705,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -26740,15 +26737,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking sqlite.h presence" >&5 -echo $ECHO_N "checking sqlite.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking openssl/ssl.h presence" >&5 +echo $ECHO_N "checking openssl/ssl.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -26781,104 +26778,105 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: sqlite.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sqlite.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sqlite.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sqlite.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sqlite.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sqlite.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sqlite.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sqlite.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sqlite.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sqlite.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: openssl/ssl.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: openssl/ssl.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for sqlite.h" >&5 -echo $ECHO_N "checking for sqlite.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sqlite_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5 +echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; } +if test "${ac_cv_header_openssl_ssl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_sqlite_h=$ac_header_preproc + ac_cv_header_openssl_ssl_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sqlite_h" >&5 -echo "${ECHO_T}$ac_cv_header_sqlite_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5 +echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; } fi -if test $ac_cv_header_sqlite_h = yes; then - SQLITE_HEADER_FOUND=1 +if test $ac_cv_header_openssl_ssl_h = yes; then + OPENSSL_HEADER_FOUND=1 else - SQLITE_HEADER_FOUND=0 + OPENSSL_HEADER_FOUND=0 fi fi fi - if test "x${SQLITE_HEADER_FOUND}" = "x0" ; then - if test -n "${SQLITE_MANDATORY}" ; - then - { echo "$as_me:$LINENO: ***" >&5 -echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** It appears that you do not have the sqlite development package installed." >&5 -echo "$as_me: *** It appears that you do not have the sqlite development package installed." >&6;} - { echo "$as_me:$LINENO: *** Please install it to include ${SQLITE_DESCRIP} support, or re-run configure" >&5 -echo "$as_me: *** Please install it to include ${SQLITE_DESCRIP} support, or re-run configure" >&6;} - { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SQLITE_OPTION}" >&5 -echo "$as_me: *** without explicitly specifying --with-${SQLITE_OPTION}" >&6;} + if test "x${OPENSSL_HEADER_FOUND}" = "x0" ; then + if test -n "${OPENSSL_MANDATORY}" ; + then + { echo "$as_me:$LINENO: ***" >&5 +echo "$as_me: ***" >&6;} + { echo "$as_me:$LINENO: *** It appears that you do not have the ssl development package installed." >&5 +echo "$as_me: *** It appears that you do not have the ssl development package installed." >&6;} + { echo "$as_me:$LINENO: *** Please install it to include ${OPENSSL_DESCRIP} support, or re-run configure" >&5 +echo "$as_me: *** Please install it to include ${OPENSSL_DESCRIP} support, or re-run configure" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OPENSSL_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${OPENSSL_OPTION}" >&6;} exit 1 fi - SQLITE_LIB="" - SQLITE_INCLUDE="" - PBX_SQLITE=0 + OPENSSL_LIB="" + OPENSSL_INCLUDE="" + PBX_OPENSSL=0 else - PBX_SQLITE=1 + PBX_OPENSSL=1 cat >>confdefs.h <<_ACEOF -#define HAVE_SQLITE 1 +#define HAVE_OPENSSL 1 _ACEOF fi - elif test -n "${SQLITE_MANDATORY}"; + elif test -n "${OPENSSL_MANDATORY}"; then { echo "$as_me:$LINENO: ***" >&5 echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** The ${SQLITE_DESCRIP} installation on this system appears to be broken." >&5 -echo "$as_me: *** The ${SQLITE_DESCRIP} installation on this system appears to be broken." >&6;} + { echo "$as_me:$LINENO: *** The ${OPENSSL_DESCRIP} installation on this system appears to be broken." >&5 +echo "$as_me: *** The ${OPENSSL_DESCRIP} installation on this system appears to be broken." >&6;} { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SQLITE_OPTION}" >&5 -echo "$as_me: *** without explicitly specifying --with-${SQLITE_OPTION}" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OPENSSL_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${OPENSSL_OPTION}" >&6;} exit 1 fi fi +if test "$PBX_OPENSSL" = "1"; +then - -if test "${USE_OPENSSL}" != "no"; then +if test "${USE_OSPTK}" != "no"; then pbxlibdir="" - if test "x${OPENSSL_DIR}" != "x"; then - if test -d ${OPENSSL_DIR}/lib; then - pbxlibdir="-L${OPENSSL_DIR}/lib" + if test "x${OSPTK_DIR}" != "x"; then + if test -d ${OSPTK_DIR}/lib; then + pbxlibdir="-L${OSPTK_DIR}/lib" else - pbxlibdir="-L${OPENSSL_DIR}" + pbxlibdir="-L${OSPTK_DIR}" fi fi - { echo "$as_me:$LINENO: checking for ssl2_connect in -lssl" >&5 -echo $ECHO_N "checking for ssl2_connect in -lssl... $ECHO_C" >&6; } -if test "${ac_cv_lib_ssl_ssl2_connect+set}" = set; then + { echo "$as_me:$LINENO: checking for OSPPCryptoDecrypt in -losptk" >&5 +echo $ECHO_N "checking for OSPPCryptoDecrypt in -losptk... $ECHO_C" >&6; } +if test "${ac_cv_lib_osptk_OSPPCryptoDecrypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lssl ${pbxlibdir} -lcrypto $LIBS" +LIBS="-losptk ${pbxlibdir} -lcrypto -lssl $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26892,11 +26890,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char ssl2_connect (); +char OSPPCryptoDecrypt (); int main () { -return ssl2_connect (); +return OSPPCryptoDecrypt (); ; return 0; } @@ -26919,40 +26917,40 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_ssl_ssl2_connect=yes + ac_cv_lib_osptk_OSPPCryptoDecrypt=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_ssl_ssl2_connect=no + ac_cv_lib_osptk_OSPPCryptoDecrypt=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_ssl2_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_ssl_ssl2_connect" >&6; } -if test $ac_cv_lib_ssl_ssl2_connect = yes; then - AST_OPENSSL_FOUND=yes +{ echo "$as_me:$LINENO: result: $ac_cv_lib_osptk_OSPPCryptoDecrypt" >&5 +echo "${ECHO_T}$ac_cv_lib_osptk_OSPPCryptoDecrypt" >&6; } +if test $ac_cv_lib_osptk_OSPPCryptoDecrypt = yes; then + AST_OSPTK_FOUND=yes else - AST_OPENSSL_FOUND=no + AST_OSPTK_FOUND=no fi - if test "${AST_OPENSSL_FOUND}" = "yes"; then - OPENSSL_LIB="-lssl -lcrypto" - OPENSSL_HEADER_FOUND="1" - if test "x${OPENSSL_DIR}" != "x"; then - OPENSSL_LIB="${pbxlibdir} ${OPENSSL_LIB}" - OPENSSL_INCLUDE="-I${OPENSSL_DIR}/include" + if test "${AST_OSPTK_FOUND}" = "yes"; then + OSPTK_LIB="-losptk -lcrypto -lssl" + OSPTK_HEADER_FOUND="1" + if test "x${OSPTK_DIR}" != "x"; then + OSPTK_LIB="${pbxlibdir} ${OSPTK_LIB}" + OSPTK_INCLUDE="-I${OSPTK_DIR}/include" saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} -I${OPENSSL_DIR}/include" - if test "xopenssl/ssl.h" != "x" ; then - as_ac_Header=`echo "ac_cv_header_${OPENSSL_DIR}/include/openssl/ssl.h" | $as_tr_sh` + CPPFLAGS="${CPPFLAGS} -I${OSPTK_DIR}/include" + if test "xosp/osp.h" != "x" ; then + as_ac_Header=`echo "ac_cv_header_${OSPTK_DIR}/include/osp/osp.h" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for ${OPENSSL_DIR}/include/openssl/ssl.h" >&5 -echo $ECHO_N "checking for ${OPENSSL_DIR}/include/openssl/ssl.h... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for ${OSPTK_DIR}/include/osp/osp.h" >&5 +echo $ECHO_N "checking for ${OSPTK_DIR}/include/osp/osp.h... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi @@ -26961,8 +26959,8 @@ ac_res=`eval echo '${'$as_ac_Header'}'` echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${OPENSSL_DIR}/include/openssl/ssl.h usability" >&5 -echo $ECHO_N "checking ${OPENSSL_DIR}/include/openssl/ssl.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ${OSPTK_DIR}/include/osp/osp.h usability" >&5 +echo $ECHO_N "checking ${OSPTK_DIR}/include/osp/osp.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26970,7 +26968,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <${OPENSSL_DIR}/include/openssl/ssl.h> +#include <${OSPTK_DIR}/include/osp/osp.h> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -27002,15 +27000,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking ${OPENSSL_DIR}/include/openssl/ssl.h presence" >&5 -echo $ECHO_N "checking ${OPENSSL_DIR}/include/openssl/ssl.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ${OSPTK_DIR}/include/osp/osp.h presence" >&5 +echo $ECHO_N "checking ${OSPTK_DIR}/include/osp/osp.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <${OPENSSL_DIR}/include/openssl/ssl.h> +#include <${OSPTK_DIR}/include/osp/osp.h> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -27043,30 +27041,30 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for ${OPENSSL_DIR}/include/openssl/ssl.h" >&5 -echo $ECHO_N "checking for ${OPENSSL_DIR}/include/openssl/ssl.h... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking for ${OSPTK_DIR}/include/osp/osp.h" >&5 +echo $ECHO_N "checking for ${OSPTK_DIR}/include/osp/osp.h... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -27078,28 +27076,28 @@ echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - OPENSSL_HEADER_FOUND=1 + OSPTK_HEADER_FOUND=1 else - OPENSSL_HEADER_FOUND=0 + OSPTK_HEADER_FOUND=0 fi fi CPPFLAGS="${saved_cppflags}" else - if test "xopenssl/ssl.h" != "x" ; then - if test "${ac_cv_header_openssl_ssl_h+set}" = set; then - { echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5 -echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_openssl_ssl_h+set}" = set; then + if test "xosp/osp.h" != "x" ; then + if test "${ac_cv_header_osp_osp_h+set}" = set; then + { echo "$as_me:$LINENO: checking for osp/osp.h" >&5 +echo $ECHO_N "checking for osp/osp.h... $ECHO_C" >&6; } +if test "${ac_cv_header_osp_osp_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5 -echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_osp_osp_h" >&5 +echo "${ECHO_T}$ac_cv_header_osp_osp_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking openssl/ssl.h usability" >&5 -echo $ECHO_N "checking openssl/ssl.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking osp/osp.h usability" >&5 +echo $ECHO_N "checking osp/osp.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27107,7 +27105,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -27139,15 +27137,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking openssl/ssl.h presence" >&5 -echo $ECHO_N "checking openssl/ssl.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking osp/osp.h presence" >&5 +echo $ECHO_N "checking osp/osp.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -27180,86 +27178,87 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: osp/osp.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: osp/osp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: osp/osp.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: osp/osp.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: openssl/ssl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: openssl/ssl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: osp/osp.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: osp/osp.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: osp/osp.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: osp/osp.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: osp/osp.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: osp/osp.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: osp/osp.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: osp/osp.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: osp/osp.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: osp/osp.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: osp/osp.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: osp/osp.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5 -echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_openssl_ssl_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for osp/osp.h" >&5 +echo $ECHO_N "checking for osp/osp.h... $ECHO_C" >&6; } +if test "${ac_cv_header_osp_osp_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_openssl_ssl_h=$ac_header_preproc + ac_cv_header_osp_osp_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5 -echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_osp_osp_h" >&5 +echo "${ECHO_T}$ac_cv_header_osp_osp_h" >&6; } fi -if test $ac_cv_header_openssl_ssl_h = yes; then - OPENSSL_HEADER_FOUND=1 +if test $ac_cv_header_osp_osp_h = yes; then + OSPTK_HEADER_FOUND=1 else - OPENSSL_HEADER_FOUND=0 + OSPTK_HEADER_FOUND=0 fi fi fi - if test "x${OPENSSL_HEADER_FOUND}" = "x0" ; then - if test -n "${OPENSSL_MANDATORY}" ; + if test "x${OSPTK_HEADER_FOUND}" = "x0" ; then + if test -n "${OSPTK_MANDATORY}" ; then { echo "$as_me:$LINENO: ***" >&5 echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** It appears that you do not have the ssl development package installed." >&5 -echo "$as_me: *** It appears that you do not have the ssl development package installed." >&6;} - { echo "$as_me:$LINENO: *** Please install it to include ${OPENSSL_DESCRIP} support, or re-run configure" >&5 -echo "$as_me: *** Please install it to include ${OPENSSL_DESCRIP} support, or re-run configure" >&6;} - { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OPENSSL_OPTION}" >&5 -echo "$as_me: *** without explicitly specifying --with-${OPENSSL_OPTION}" >&6;} + { echo "$as_me:$LINENO: *** It appears that you do not have the osptk development package installed." >&5 +echo "$as_me: *** It appears that you do not have the osptk development package installed." >&6;} + { echo "$as_me:$LINENO: *** Please install it to include ${OSPTK_DESCRIP} support, or re-run configure" >&5 +echo "$as_me: *** Please install it to include ${OSPTK_DESCRIP} support, or re-run configure" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OSPTK_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${OSPTK_OPTION}" >&6;} exit 1 fi - OPENSSL_LIB="" - OPENSSL_INCLUDE="" - PBX_OPENSSL=0 + OSPTK_LIB="" + OSPTK_INCLUDE="" + PBX_OSPTK=0 else - PBX_OPENSSL=1 + PBX_OSPTK=1 cat >>confdefs.h <<_ACEOF -#define HAVE_OPENSSL 1 +#define HAVE_OSPTK 1 _ACEOF fi - elif test -n "${OPENSSL_MANDATORY}"; + elif test -n "${OSPTK_MANDATORY}"; then { echo "$as_me:$LINENO: ***" >&5 echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** The ${OPENSSL_DESCRIP} installation on this system appears to be broken." >&5 -echo "$as_me: *** The ${OPENSSL_DESCRIP} installation on this system appears to be broken." >&6;} + { echo "$as_me:$LINENO: *** The ${OSPTK_DESCRIP} installation on this system appears to be broken." >&5 +echo "$as_me: *** The ${OSPTK_DESCRIP} installation on this system appears to be broken." >&6;} { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OPENSSL_OPTION}" >&5 -echo "$as_me: *** without explicitly specifying --with-${OPENSSL_OPTION}" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OSPTK_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${OSPTK_OPTION}" >&6;} exit 1 fi fi +fi if test "${USE_FREETDS}" != "no"; then diff --git a/configure.ac b/configure.ac index 16693c473e..44ce0278c3 100644 --- a/configure.ac +++ b/configure.ac @@ -694,11 +694,6 @@ AST_EXT_LIB_CHECK([UNIXODBC], [odbc], [SQLConnect], [sql.h], [-lltdl]) AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], []) -if test "$PBX_OPENSSL" = "1"; -then - AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl]) -fi - if test "${USE_OSS}" != "no"; then PBX_OSS=0 AC_CHECK_HEADER([linux/soundcard.h], @@ -906,6 +901,10 @@ AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm]) AST_EXT_LIB_CHECK([SQLITE], [sqlite], [sqlite_exec], [sqlite.h]) AST_EXT_LIB_CHECK([OPENSSL], [ssl], [ssl2_connect], [openssl/ssl.h], [-lcrypto]) +if test "$PBX_OPENSSL" = "1"; +then + AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl]) +fi AST_EXT_LIB_CHECK([FREETDS], [tds], [tds_version], [tds.h]) if test "${PBX_FREETDS}" != "0";