diff options
| -rw-r--r-- | autoconf/ast_c_compile_check.m4 | 2 | ||||
| -rw-r--r-- | autoconf/ast_c_define_check.m4 | 2 | ||||
| -rw-r--r-- | autoconf/ast_ext_lib.m4 | 15 | ||||
| -rwxr-xr-x | configure | 760 | ||||
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 213 |
5 files changed, 428 insertions, 564 deletions
diff --git a/autoconf/ast_c_compile_check.m4 b/autoconf/ast_c_compile_check.m4 index 0d49ec3ca..ed1563017 100644 --- a/autoconf/ast_c_compile_check.m4 +++ b/autoconf/ast_c_compile_check.m4 @@ -22,7 +22,7 @@ AC_DEFUN([AST_C_COMPILE_CHECK], [ AC_MSG_RESULT(yes) PBX_$1=1 AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 headers.]) - AC_DEFINE([HAVE_$1_VERSION], $4, [Define $1 headers version]) + m4_ifval([$4], [AC_DEFINE([HAVE_$1_VERSION], $4, [Define $1 headers version])]) ], [ AC_MSG_RESULT(no) ] ) diff --git a/autoconf/ast_c_define_check.m4 b/autoconf/ast_c_define_check.m4 index adf31223e..52b979110 100644 --- a/autoconf/ast_c_define_check.m4 +++ b/autoconf/ast_c_define_check.m4 @@ -23,7 +23,7 @@ AC_DEFUN([AST_C_DEFINE_CHECK], [ AC_MSG_RESULT(yes) PBX_$1=1 AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 headers.]) - AC_DEFINE([HAVE_$1_VERSION], $4, [Define $1 headers version]) + m4_ifval([$4], [AC_DEFINE([HAVE_$1_VERSION], $4, [Define $1 headers version])]) ], [ AC_MSG_RESULT(no) ] ) diff --git a/autoconf/ast_ext_lib.m4 b/autoconf/ast_ext_lib.m4 index a1b36bea7..d35d51598 100644 --- a/autoconf/ast_ext_lib.m4 +++ b/autoconf/ast_ext_lib.m4 @@ -30,7 +30,6 @@ AC_DEFUN([AST_EXT_LIB_SETUP], esac ]) AH_TEMPLATE(m4_bpatsubst([[HAVE_$1]], [(.*)]), [Define to 1 if you have the $2 library.]) - AH_TEMPLATE(m4_bpatsubst([[HAVE_$1_VERSION]], [(.*)]), [Define to the version of the $2 library.]) AC_SUBST([$1_LIB]) AC_SUBST([$1_INCLUDE]) AC_SUBST([$1_DIR]) @@ -81,7 +80,10 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_$1_FOUND=yes else - AC_CHECK_LIB([$2], [${pbxfuncname}], [AST_$1_FOUND=yes], [AST_$1_FOUND=no], ${pbxlibdir} $5) + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} $6" + AC_CHECK_LIB([$2], [${pbxfuncname}], [AST_$1_FOUND=yes], [AST_$1_FOUND=no], [${pbxlibdir} $5]) + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -95,10 +97,10 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then if test "x$4" = "x" ; then # no header, assume found $1_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}" AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0]) - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${$1_HEADER_FOUND}" = "x0" ; then $1_LIB="" @@ -110,9 +112,14 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then PBX_$1=1 cat >>confdefs.h <<_ACEOF [@%:@define] HAVE_$1 1 +_ACEOF + m4_ifval([$7], [ + cat >>confdefs.h <<_ACEOF [@%:@define] HAVE_$1_VERSION $7 _ACEOF + ]) fi fi fi +m4_ifval([$7], [AH_TEMPLATE(m4_bpatsubst([[HAVE_$1_VERSION]], [(.*)]), [Define to the version of the $2 library.])]) ]) @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 261916 . +# From configure.ac Revision: 262051 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -8326,8 +8326,6 @@ fi - - # BKTR is used for backtrace support on platforms that do not # have it natively. @@ -8364,8 +8362,6 @@ fi - - CAP_DESCRIP="POSIX 1.e capabilities" CAP_OPTION="cap" PBX_CAP=0 @@ -8399,8 +8395,6 @@ fi - - CURL_DESCRIP="cURL" CURL_OPTION="curl" PBX_CURL=0 @@ -8434,8 +8428,6 @@ fi - - CURSES_DESCRIP="curses" CURSES_OPTION="curses" PBX_CURSES=0 @@ -8469,8 +8461,6 @@ fi - - CRYPTO_DESCRIP="OpenSSL Cryptography" CRYPTO_OPTION="crypto" PBX_CRYPTO=0 @@ -8504,8 +8494,6 @@ fi - - DAHDI_DESCRIP="DAHDI" DAHDI_OPTION="dahdi" PBX_DAHDI=0 @@ -8539,8 +8527,6 @@ fi - - FFMPEG_DESCRIP="Ffmpeg and avcodec" FFMPEG_OPTION="avcodec" PBX_FFMPEG=0 @@ -8574,8 +8560,6 @@ fi - - GSM_DESCRIP="External GSM" GSM_OPTION="gsm" PBX_GSM=0 @@ -8609,8 +8593,6 @@ fi - - GTK_DESCRIP="gtk" GTK_OPTION="gtk" PBX_GTK=0 @@ -8644,8 +8626,6 @@ fi - - GTK2_DESCRIP="gtk2" GTK2_OPTION="gtk2" PBX_GTK2=0 @@ -8679,8 +8659,6 @@ fi - - GMIME_DESCRIP="GMime" GMIME_OPTION="gmime" PBX_GMIME=0 @@ -8714,8 +8692,6 @@ fi - - HOARD_DESCRIP="Hoard Memory Allocator" HOARD_OPTION="hoard" PBX_HOARD=0 @@ -8749,8 +8725,6 @@ fi - - ICONV_DESCRIP="Iconv" ICONV_OPTION="iconv" PBX_ICONV=0 @@ -8784,8 +8758,6 @@ fi - - IKSEMEL_DESCRIP="Iksemel Jabber" IKSEMEL_OPTION="iksemel" PBX_IKSEMEL=0 @@ -8819,8 +8791,6 @@ fi - - IMAP_TK_DESCRIP="UW IMAP Toolkit" IMAP_TK_OPTION="imap" PBX_IMAP_TK=0 @@ -8854,8 +8824,6 @@ fi - - INOTIFY_DESCRIP="inotify support" INOTIFY_OPTION="inotify" PBX_INOTIFY=0 @@ -8889,8 +8857,6 @@ fi - - IODBC_DESCRIP="iODBC" IODBC_OPTION="iodbc" PBX_IODBC=0 @@ -8924,8 +8890,6 @@ fi - - ISDNNET_DESCRIP="ISDN4Linux" ISDNNET_OPTION="isdnnet" PBX_ISDNNET=0 @@ -8959,8 +8923,6 @@ fi - - JACK_DESCRIP="Jack Audio Connection Kit" JACK_OPTION="jack" PBX_JACK=0 @@ -8994,8 +8956,6 @@ fi - - LDAP_DESCRIP="OpenLDAP" LDAP_OPTION="ldap" PBX_LDAP=0 @@ -9029,8 +8989,6 @@ fi - - LIBXML2_DESCRIP="LibXML2" LIBXML2_OPTION="libxml2" PBX_LIBXML2=0 @@ -9064,8 +9022,6 @@ fi - - LTDL_DESCRIP="libtool" LTDL_OPTION="ltdl" PBX_LTDL=0 @@ -9099,8 +9055,6 @@ fi - - LUA_DESCRIP="Lua" LUA_OPTION="lua" PBX_LUA=0 @@ -9134,8 +9088,6 @@ fi - - MISDN_DESCRIP="mISDN user" MISDN_OPTION="misdn" PBX_MISDN=0 @@ -9169,8 +9121,6 @@ fi - - NBS_DESCRIP="Network Broadcast Sound" NBS_OPTION="nbs" PBX_NBS=0 @@ -9204,8 +9154,6 @@ fi - - NCURSES_DESCRIP="ncurses" NCURSES_OPTION="ncurses" PBX_NCURSES=0 @@ -9239,8 +9187,6 @@ fi - - NETSNMP_DESCRIP="Net-SNMP" NETSNMP_OPTION="netsnmp" PBX_NETSNMP=0 @@ -9274,8 +9220,6 @@ fi - - NEWT_DESCRIP="newt" NEWT_OPTION="newt" PBX_NEWT=0 @@ -9309,8 +9253,6 @@ fi - - OGG_DESCRIP="OGG" OGG_OPTION="ogg" PBX_OGG=0 @@ -9344,8 +9286,6 @@ fi - - OSPTK_DESCRIP="OSP Toolkit" OSPTK_OPTION="osptk" PBX_OSPTK=0 @@ -9379,8 +9319,6 @@ fi - - OSS_DESCRIP="Open Sound System" OSS_OPTION="oss" PBX_OSS=0 @@ -9414,8 +9352,6 @@ fi - - PGSQL_DESCRIP="PostgreSQL" PGSQL_OPTION="postgres" PBX_PGSQL=0 @@ -9449,8 +9385,6 @@ fi - - POPT_DESCRIP="popt" POPT_OPTION="popt" PBX_POPT=0 @@ -9484,8 +9418,6 @@ fi - - PORTAUDIO_DESCRIP="PortAudio" PORTAUDIO_OPTION="portaudio" PBX_PORTAUDIO=0 @@ -9519,8 +9451,6 @@ fi - - PRI_DESCRIP="ISDN PRI" PRI_OPTION="pri" PBX_PRI=0 @@ -9554,8 +9484,6 @@ fi - - PRI_INBANDDISCONNECT_DESCRIP="ISDN PRI set_inbanddisconnect" PRI_INBANDDISCONNECT_OPTION=pri @@ -9608,8 +9536,6 @@ fi - - SPANDSP_DESCRIP="SPANDSP" SPANDSP_OPTION="spandsp" PBX_SPANDSP=0 @@ -9643,8 +9569,6 @@ fi - - SS7_DESCRIP="ISDN SS7" SS7_OPTION="ss7" PBX_SS7=0 @@ -9678,8 +9602,6 @@ fi - - OPENR2_DESCRIP="MFR2" OPENR2_OPTION="openr2" PBX_OPENR2=0 @@ -9713,8 +9635,6 @@ fi - - PWLIB_DESCRIP="PWlib" PWLIB_OPTION="pwlib" PBX_PWLIB=0 @@ -9748,8 +9668,6 @@ fi - - OPENH323_DESCRIP="OpenH323" OPENH323_OPTION="h323" PBX_OPENH323=0 @@ -9783,8 +9701,6 @@ fi - - RADIUS_DESCRIP="Radius Client" RADIUS_OPTION="radius" PBX_RADIUS=0 @@ -9818,8 +9734,6 @@ fi - - SDL_DESCRIP="Sdl" SDL_OPTION="sdl" PBX_SDL=0 @@ -9853,8 +9767,6 @@ fi - - SDL_IMAGE_DESCRIP="Sdl Image" SDL_IMAGE_OPTION="SDL_image" PBX_SDL_IMAGE=0 @@ -9888,8 +9800,6 @@ fi - - OPENAIS_DESCRIP="OpenAIS" OPENAIS_OPTION="openais" PBX_OPENAIS=0 @@ -9923,8 +9833,6 @@ fi - - SPEEX_DESCRIP="Speex" SPEEX_OPTION="speex" PBX_SPEEX=0 @@ -9958,8 +9866,6 @@ fi - - SPEEX_PREPROCESS_DESCRIP="Speex preprocess routines" SPEEX_PREPROCESS_OPTION="speex" PBX_SPEEX_PREPROCESS=0 @@ -9993,8 +9899,6 @@ fi - - SPEEXDSP_DESCRIP="SpeexDSP" SPEEXDSP_OPTION="speexdsp" PBX_SPEEXDSP=0 @@ -10028,8 +9932,6 @@ fi - - SPEEX_PREPROCESS_DESCRIP="speex_preprocess_ctl" SPEEX_PREPROCESS_OPTION=speex @@ -10075,8 +9977,6 @@ fi - - SQLITE3_DESCRIP="SQLite" SQLITE3_OPTION="sqlite3" PBX_SQLITE3=0 @@ -10110,8 +10010,6 @@ fi - - SUPPSERV_DESCRIP="mISDN Supplemental Services" SUPPSERV_OPTION="suppserv" PBX_SUPPSERV=0 @@ -10145,8 +10043,6 @@ fi - - OPENSSL_DESCRIP="OpenSSL Secure Sockets Layer" OPENSSL_OPTION="ssl" PBX_OPENSSL=0 @@ -10180,8 +10076,6 @@ fi - - FREETDS_DESCRIP="FreeTDS" FREETDS_OPTION="tds" PBX_FREETDS=0 @@ -10215,8 +10109,6 @@ fi - - TERMCAP_DESCRIP="Termcap" TERMCAP_OPTION="termcap" PBX_TERMCAP=0 @@ -10250,8 +10142,6 @@ fi - - TINFO_DESCRIP="Term Info" TINFO_OPTION="tinfo" PBX_TINFO=0 @@ -10285,8 +10175,6 @@ fi - - TONEZONE_DESCRIP="tonezone" TONEZONE_OPTION="tonezone" PBX_TONEZONE=0 @@ -10320,8 +10208,6 @@ fi - - UNIXODBC_DESCRIP="unixODBC" UNIXODBC_OPTION="unixodbc" PBX_UNIXODBC=0 @@ -10355,8 +10241,6 @@ fi - - USB_DESCRIP="usb" USB_OPTION="usb" PBX_USB=0 @@ -10390,8 +10274,6 @@ fi - - VORBIS_DESCRIP="Vorbis" VORBIS_OPTION="vorbis" PBX_VORBIS=0 @@ -10425,8 +10307,6 @@ fi - - VPB_DESCRIP="Voicetronix API" VPB_OPTION="vpb" PBX_VPB=0 @@ -10460,8 +10340,6 @@ fi - - X11_DESCRIP="X11" X11_OPTION="x11" PBX_X11=0 @@ -10495,8 +10373,6 @@ fi - - ZLIB_DESCRIP="zlib compression" ZLIB_OPTION="z" PBX_ZLIB=0 @@ -10530,8 +10406,6 @@ fi - - TIMERFD_DESCRIP="timerfd" TIMERFD_OPTION="timerfd" PBX_TIMERFD=0 @@ -10565,8 +10439,6 @@ fi - - # check for basic system features and functionality before # checking for package libraries @@ -17730,10 +17602,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD_RWLOCK_INITIALIZER_VERSION -_ACEOF - else echo "$as_me: failed program was:" >&5 @@ -18050,10 +17918,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP_VERSION -_ACEOF - else echo "$as_me: failed program was:" >&5 @@ -20058,10 +19922,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_IP_MTU_DISCOVER_VERSION -_ACEOF - else echo "$as_me: failed program was:" >&5 @@ -20641,6 +20501,8 @@ if test "x${PBX_ALSA}" != "x1" -a "${USE_ALSA}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_ALSA_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_asound_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lasound" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lasound... $ECHO_C" >&6; } @@ -20710,6 +20572,7 @@ else AST_ALSA_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -20723,7 +20586,7 @@ fi if test "xalsa/asoundlib.h" = "x" ; then # no header, assume found ALSA_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ALSA_INCLUDE}" if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then { echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5 @@ -20862,7 +20725,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${ALSA_HEADER_FOUND}" = "x0" ; then ALSA_LIB="" @@ -20874,14 +20737,15 @@ fi PBX_ALSA=1 cat >>confdefs.h <<_ACEOF #define HAVE_ALSA 1 -#define HAVE_ALSA_VERSION _ACEOF + fi fi fi + if test "x${PBX_CURSES}" != "x1" -a "${USE_CURSES}" != "no"; then pbxlibdir="" # if --with-CURSES=DIR has been specified, use it. @@ -20896,6 +20760,8 @@ if test "x${PBX_CURSES}" != "x1" -a "${USE_CURSES}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_CURSES_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_curses_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lcurses" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lcurses... $ECHO_C" >&6; } @@ -20965,6 +20831,7 @@ else AST_CURSES_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -20978,7 +20845,7 @@ fi if test "xcurses.h" = "x" ; then # no header, assume found CURSES_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${CURSES_INCLUDE}" if test "${ac_cv_header_curses_h+set}" = set; then { echo "$as_me:$LINENO: checking for curses.h" >&5 @@ -21117,7 +20984,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${CURSES_HEADER_FOUND}" = "x0" ; then CURSES_LIB="" @@ -21129,13 +20996,14 @@ fi PBX_CURSES=1 cat >>confdefs.h <<_ACEOF #define HAVE_CURSES 1 -#define HAVE_CURSES_VERSION _ACEOF + fi fi fi + if test "x${OSARCH}" = "xlinux-gnu" ; then if test "x${PBX_CAP}" != "x1" -a "${USE_CAP}" != "no"; then @@ -21152,6 +21020,8 @@ if test "x${PBX_CAP}" != "x1" -a "${USE_CAP}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_CAP_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_cap_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lcap" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lcap... $ECHO_C" >&6; } @@ -21221,6 +21091,7 @@ else AST_CAP_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -21234,7 +21105,7 @@ fi if test "xsys/capability.h" = "x" ; then # no header, assume found CAP_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${CAP_INCLUDE}" if test "${ac_cv_header_sys_capability_h+set}" = set; then { echo "$as_me:$LINENO: checking for sys/capability.h" >&5 @@ -21373,7 +21244,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${CAP_HEADER_FOUND}" = "x0" ; then CAP_LIB="" @@ -21385,12 +21256,13 @@ fi PBX_CAP=1 cat >>confdefs.h <<_ACEOF #define HAVE_CAP 1 -#define HAVE_CAP_VERSION _ACEOF + fi fi fi + fi @@ -21450,10 +21322,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_DAHDI_VERSION -_ACEOF - else echo "$as_me: failed program was:" >&5 @@ -21527,10 +21395,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_DAHDI_HALF_FULL_VERSION -_ACEOF - else echo "$as_me: failed program was:" >&5 @@ -21604,10 +21468,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_DAHDI_LINEREVERSE_VMWI_VERSION -_ACEOF - else echo "$as_me: failed program was:" >&5 @@ -21680,10 +21540,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETIFADDRS_VERSION -_ACEOF - else echo "$as_me: failed program was:" >&5 @@ -21755,10 +21611,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_TIMERFD_VERSION -_ACEOF - else echo "$as_me: failed program was:" >&5 @@ -22488,6 +22340,8 @@ if test "x${PBX_ICONV}" != "x1" -a "${USE_ICONV}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_ICONV_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_iconv_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -liconv" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -liconv... $ECHO_C" >&6; } @@ -22557,6 +22411,7 @@ else AST_ICONV_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -22570,7 +22425,7 @@ fi if test "xiconv.h" = "x" ; then # no header, assume found ICONV_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ICONV_INCLUDE}" if test "${ac_cv_header_iconv_h+set}" = set; then { echo "$as_me:$LINENO: checking for iconv.h" >&5 @@ -22709,7 +22564,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${ICONV_HEADER_FOUND}" = "x0" ; then ICONV_LIB="" @@ -22721,12 +22576,13 @@ fi PBX_ICONV=1 cat >>confdefs.h <<_ACEOF #define HAVE_ICONV 1 -#define HAVE_ICONV_VERSION _ACEOF + fi fi fi + # Some versions of Linux package iconv in glibc if test "x${PBX_ICONV}" != "x1" -a "${USE_ICONV}" != "no"; then @@ -22743,6 +22599,8 @@ if test "x${PBX_ICONV}" != "x1" -a "${USE_ICONV}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_ICONV_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_c_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lc" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lc... $ECHO_C" >&6; } @@ -22812,6 +22670,7 @@ else AST_ICONV_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -22825,7 +22684,7 @@ fi if test "xiconv.h" = "x" ; then # no header, assume found ICONV_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ICONV_INCLUDE}" if test "${ac_cv_header_iconv_h+set}" = set; then { echo "$as_me:$LINENO: checking for iconv.h" >&5 @@ -22964,7 +22823,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${ICONV_HEADER_FOUND}" = "x0" ; then ICONV_LIB="" @@ -22976,14 +22835,15 @@ fi PBX_ICONV=1 cat >>confdefs.h <<_ACEOF #define HAVE_ICONV 1 -#define HAVE_ICONV_VERSION _ACEOF + fi fi fi + if test "x${PBX_IKSEMEL}" != "x1" -a "${USE_IKSEMEL}" != "no"; then pbxlibdir="" # if --with-IKSEMEL=DIR has been specified, use it. @@ -22998,6 +22858,8 @@ if test "x${PBX_IKSEMEL}" != "x1" -a "${USE_IKSEMEL}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_IKSEMEL_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_iksemel_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -liksemel" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -liksemel... $ECHO_C" >&6; } @@ -23067,6 +22929,7 @@ else AST_IKSEMEL_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -23080,7 +22943,7 @@ fi if test "xiksemel.h" = "x" ; then # no header, assume found IKSEMEL_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${IKSEMEL_INCLUDE}" if test "${ac_cv_header_iksemel_h+set}" = set; then { echo "$as_me:$LINENO: checking for iksemel.h" >&5 @@ -23219,7 +23082,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${IKSEMEL_HEADER_FOUND}" = "x0" ; then IKSEMEL_LIB="" @@ -23231,13 +23094,14 @@ fi PBX_IKSEMEL=1 cat >>confdefs.h <<_ACEOF #define HAVE_IKSEMEL 1 -#define HAVE_IKSEMEL_VERSION _ACEOF + fi fi fi + if test "${USE_IMAP_TK}" != "no"; then saved_cppflags="${CPPFLAGS}" saved_libs="${LIBS}" @@ -24085,6 +23949,8 @@ if test "x${PBX_IODBC}" != "x1" -a "${USE_IODBC}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_IODBC_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" as_ac_Lib=`echo "ac_cv_lib_iodbc_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -liodbc" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -liodbc... $ECHO_C" >&6; } @@ -24154,6 +24020,7 @@ else AST_IODBC_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -24167,7 +24034,7 @@ fi if test "xsql.h" = "x" ; then # no header, assume found IODBC_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${IODBC_INCLUDE}" if test "${ac_cv_header_sql_h+set}" = set; then { echo "$as_me:$LINENO: checking for sql.h" >&5 @@ -24306,7 +24173,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${IODBC_HEADER_FOUND}" = "x0" ; then IODBC_LIB="" @@ -24318,14 +24185,15 @@ fi PBX_IODBC=1 cat >>confdefs.h <<_ACEOF #define HAVE_IODBC 1 -#define HAVE_IODBC_VERSION _ACEOF + fi fi fi + if test "x${PBX_INOTIFY}" != "x1" -a "${USE_INOTIFY}" != "no"; then pbxlibdir="" # if --with-INOTIFY=DIR has been specified, use it. @@ -24340,6 +24208,8 @@ if test "x${PBX_INOTIFY}" != "x1" -a "${USE_INOTIFY}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_INOTIFY_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_c_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lc" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lc... $ECHO_C" >&6; } @@ -24409,6 +24279,7 @@ else AST_INOTIFY_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -24422,7 +24293,7 @@ fi if test "xsys/inotify.h" = "x" ; then # no header, assume found INOTIFY_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${INOTIFY_INCLUDE}" if test "${ac_cv_header_sys_inotify_h+set}" = set; then { echo "$as_me:$LINENO: checking for sys/inotify.h" >&5 @@ -24561,7 +24432,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${INOTIFY_HEADER_FOUND}" = "x0" ; then INOTIFY_LIB="" @@ -24573,14 +24444,15 @@ fi PBX_INOTIFY=1 cat >>confdefs.h <<_ACEOF #define HAVE_INOTIFY 1 -#define HAVE_INOTIFY_VERSION _ACEOF + fi fi fi + if test "x${PBX_JACK}" != "x1" -a "${USE_JACK}" != "no"; then pbxlibdir="" # if --with-JACK=DIR has been specified, use it. @@ -24595,6 +24467,8 @@ if test "x${PBX_JACK}" != "x1" -a "${USE_JACK}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_JACK_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_jack_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -ljack" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -ljack... $ECHO_C" >&6; } @@ -24664,6 +24538,7 @@ else AST_JACK_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -24677,7 +24552,7 @@ fi if test "xjack/jack.h" = "x" ; then # no header, assume found JACK_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${JACK_INCLUDE}" if test "${ac_cv_header_jack_jack_h+set}" = set; then { echo "$as_me:$LINENO: checking for jack/jack.h" >&5 @@ -24816,7 +24691,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${JACK_HEADER_FOUND}" = "x0" ; then JACK_LIB="" @@ -24828,13 +24703,14 @@ fi PBX_JACK=1 cat >>confdefs.h <<_ACEOF #define HAVE_JACK 1 -#define HAVE_JACK_VERSION _ACEOF + fi fi fi + # Needed by unixodbc if test "x${PBX_LTDL}" != "x1" -a "${USE_LTDL}" != "no"; then @@ -24851,6 +24727,8 @@ if test "x${PBX_LTDL}" != "x1" -a "${USE_LTDL}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_LTDL_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_ltdl_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lltdl" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lltdl... $ECHO_C" >&6; } @@ -24920,6 +24798,7 @@ else AST_LTDL_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -24933,7 +24812,7 @@ fi if test "xltdl.h" = "x" ; then # no header, assume found LTDL_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LTDL_INCLUDE}" if test "${ac_cv_header_ltdl_h+set}" = set; then { echo "$as_me:$LINENO: checking for ltdl.h" >&5 @@ -25072,7 +24951,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${LTDL_HEADER_FOUND}" = "x0" ; then LTDL_LIB="" @@ -25084,14 +24963,15 @@ fi PBX_LTDL=1 cat >>confdefs.h <<_ACEOF #define HAVE_LTDL 1 -#define HAVE_LTDL_VERSION _ACEOF + fi fi fi + if test "x${PBX_LDAP}" != "x1" -a "${USE_LDAP}" != "no"; then pbxlibdir="" # if --with-LDAP=DIR has been specified, use it. @@ -25106,6 +24986,8 @@ if test "x${PBX_LDAP}" != "x1" -a "${USE_LDAP}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_LDAP_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_ldap_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lldap" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lldap... $ECHO_C" >&6; } @@ -25175,6 +25057,7 @@ else AST_LDAP_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -25188,7 +25071,7 @@ fi if test "xldap.h" = "x" ; then # no header, assume found LDAP_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LDAP_INCLUDE}" if test "${ac_cv_header_ldap_h+set}" = set; then { echo "$as_me:$LINENO: checking for ldap.h" >&5 @@ -25327,7 +25210,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${LDAP_HEADER_FOUND}" = "x0" ; then LDAP_LIB="" @@ -25339,13 +25222,14 @@ fi PBX_LDAP=1 cat >>confdefs.h <<_ACEOF #define HAVE_LDAP 1 -#define HAVE_LDAP_VERSION _ACEOF + fi fi fi + # Check whether --enable-xmldoc was given. if test "${enable_xmldoc+set}" = set; then enableval=$enable_xmldoc; case "${enableval}" in @@ -25567,6 +25451,8 @@ if test "x${PBX_MISDN}" != "x1" -a "${USE_MISDN}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_MISDN_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_mISDN_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lmISDN" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lmISDN... $ECHO_C" >&6; } @@ -25636,6 +25522,7 @@ else AST_MISDN_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -25649,7 +25536,7 @@ fi if test "xmISDNuser/mISDNlib.h" = "x" ; then # no header, assume found MISDN_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${MISDN_INCLUDE}" if test "${ac_cv_header_mISDNuser_mISDNlib_h+set}" = set; then { echo "$as_me:$LINENO: checking for mISDNuser/mISDNlib.h" >&5 @@ -25788,7 +25675,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${MISDN_HEADER_FOUND}" = "x0" ; then MISDN_LIB="" @@ -25800,13 +25687,14 @@ fi PBX_MISDN=1 cat >>confdefs.h <<_ACEOF #define HAVE_MISDN 1 -#define HAVE_MISDN_VERSION _ACEOF + fi fi fi + if test "${PBX_MISDN}" = 1; then if test "x${PBX_ISDNNET}" != "x1" -a "${USE_ISDNNET}" != "no"; then @@ -25823,6 +25711,8 @@ if test "x${PBX_ISDNNET}" != "x1" -a "${USE_ISDNNET}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_ISDNNET_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_isdnnet_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lisdnnet" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lisdnnet... $ECHO_C" >&6; } @@ -25892,6 +25782,7 @@ else AST_ISDNNET_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -25905,7 +25796,7 @@ fi if test "xmISDNuser/isdn_net.h" = "x" ; then # no header, assume found ISDNNET_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ISDNNET_INCLUDE}" if test "${ac_cv_header_mISDNuser_isdn_net_h+set}" = set; then { echo "$as_me:$LINENO: checking for mISDNuser/isdn_net.h" >&5 @@ -26044,7 +25935,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${ISDNNET_HEADER_FOUND}" = "x0" ; then ISDNNET_LIB="" @@ -26056,13 +25947,14 @@ fi PBX_ISDNNET=1 cat >>confdefs.h <<_ACEOF #define HAVE_ISDNNET 1 -#define HAVE_ISDNNET_VERSION _ACEOF + fi fi fi + if test "x${PBX_SUPPSERV}" != "x1" -a "${USE_SUPPSERV}" != "no"; then pbxlibdir="" # if --with-SUPPSERV=DIR has been specified, use it. @@ -26077,6 +25969,8 @@ if test "x${PBX_SUPPSERV}" != "x1" -a "${USE_SUPPSERV}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_SUPPSERV_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_suppserv_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lsuppserv" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lsuppserv... $ECHO_C" >&6; } @@ -26146,6 +26040,7 @@ else AST_SUPPSERV_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -26159,7 +26054,7 @@ fi if test "xmISDNuser/suppserv.h" = "x" ; then # no header, assume found SUPPSERV_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SUPPSERV_INCLUDE}" if test "${ac_cv_header_mISDNuser_suppserv_h+set}" = set; then { echo "$as_me:$LINENO: checking for mISDNuser/suppserv.h" >&5 @@ -26298,7 +26193,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SUPPSERV_HEADER_FOUND}" = "x0" ; then SUPPSERV_LIB="" @@ -26310,13 +26205,14 @@ fi PBX_SUPPSERV=1 cat >>confdefs.h <<_ACEOF #define HAVE_SUPPSERV 1 -#define HAVE_SUPPSERV_VERSION _ACEOF + fi fi fi + if test "x${PBX_MISDN_FAC_RESULT}" != "x1"; then { echo "$as_me:$LINENO: checking for Fac_RESULT in mISDNuser/suppserv.h" >&5 echo $ECHO_N "checking for Fac_RESULT in mISDNuser/suppserv.h... $ECHO_C" >&6; } @@ -26373,10 +26269,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_MISDN_FAC_RESULT_VERSION -_ACEOF - else echo "$as_me: failed program was:" >&5 @@ -26449,10 +26341,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_MISDN_FAC_ERROR_VERSION -_ACEOF - else echo "$as_me: failed program was:" >&5 @@ -26624,6 +26512,8 @@ if test "x${PBX_NBS}" != "x1" -a "${USE_NBS}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_NBS_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_nbs_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lnbs" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lnbs... $ECHO_C" >&6; } @@ -26693,6 +26583,7 @@ else AST_NBS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -26706,7 +26597,7 @@ fi if test "xnbs.h" = "x" ; then # no header, assume found NBS_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${NBS_INCLUDE}" if test "${ac_cv_header_nbs_h+set}" = set; then { echo "$as_me:$LINENO: checking for nbs.h" >&5 @@ -26845,7 +26736,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${NBS_HEADER_FOUND}" = "x0" ; then NBS_LIB="" @@ -26857,14 +26748,15 @@ fi PBX_NBS=1 cat >>confdefs.h <<_ACEOF #define HAVE_NBS 1 -#define HAVE_NBS_VERSION _ACEOF + fi fi fi + if test "x${PBX_NCURSES}" != "x1" -a "${USE_NCURSES}" != "no"; then pbxlibdir="" # if --with-NCURSES=DIR has been specified, use it. @@ -26879,6 +26771,8 @@ if test "x${PBX_NCURSES}" != "x1" -a "${USE_NCURSES}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_NCURSES_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_ncurses_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lncurses" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lncurses... $ECHO_C" >&6; } @@ -26948,6 +26842,7 @@ else AST_NCURSES_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -26961,7 +26856,7 @@ fi if test "xcurses.h" = "x" ; then # no header, assume found NCURSES_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${NCURSES_INCLUDE}" if test "${ac_cv_header_curses_h+set}" = set; then { echo "$as_me:$LINENO: checking for curses.h" >&5 @@ -27100,7 +26995,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${NCURSES_HEADER_FOUND}" = "x0" ; then NCURSES_LIB="" @@ -27112,14 +27007,15 @@ fi PBX_NCURSES=1 cat >>confdefs.h <<_ACEOF #define HAVE_NCURSES 1 -#define HAVE_NCURSES_VERSION _ACEOF + fi fi fi + if test "x${PBX_NETSNMP}" != "x1" -a "${USE_NETSNMP}" != "no"; then PBX_NETSNMP=0 if test -n "$ac_tool_prefix"; then @@ -27317,6 +27213,8 @@ if test "x${PBX_NEWT}" != "x1" -a "${USE_NEWT}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_NEWT_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_newt_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lnewt" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lnewt... $ECHO_C" >&6; } @@ -27386,6 +27284,7 @@ else AST_NEWT_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -27399,7 +27298,7 @@ fi if test "xnewt.h" = "x" ; then # no header, assume found NEWT_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${NEWT_INCLUDE}" if test "${ac_cv_header_newt_h+set}" = set; then { echo "$as_me:$LINENO: checking for newt.h" >&5 @@ -27538,7 +27437,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${NEWT_HEADER_FOUND}" = "x0" ; then NEWT_LIB="" @@ -27550,14 +27449,15 @@ fi PBX_NEWT=1 cat >>confdefs.h <<_ACEOF #define HAVE_NEWT 1 -#define HAVE_NEWT_VERSION _ACEOF + fi fi fi + if test "x${PBX_UNIXODBC}" != "x1" -a "${USE_UNIXODBC}" != "no"; then pbxlibdir="" # if --with-UNIXODBC=DIR has been specified, use it. @@ -27572,6 +27472,8 @@ if test "x${PBX_UNIXODBC}" != "x1" -a "${USE_UNIXODBC}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_UNIXODBC_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_odbc_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lodbc" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lodbc... $ECHO_C" >&6; } @@ -27641,6 +27543,7 @@ else AST_UNIXODBC_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -27654,7 +27557,7 @@ fi if test "xsql.h" = "x" ; then # no header, assume found UNIXODBC_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${UNIXODBC_INCLUDE}" if test "${ac_cv_header_sql_h+set}" = set; then { echo "$as_me:$LINENO: checking for sql.h" >&5 @@ -27793,7 +27696,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${UNIXODBC_HEADER_FOUND}" = "x0" ; then UNIXODBC_LIB="" @@ -27805,14 +27708,15 @@ fi PBX_UNIXODBC=1 cat >>confdefs.h <<_ACEOF #define HAVE_UNIXODBC 1 -#define HAVE_UNIXODBC_VERSION _ACEOF + fi fi fi + if test "x${PBX_OGG}" != "x1" -a "${USE_OGG}" != "no"; then pbxlibdir="" # if --with-OGG=DIR has been specified, use it. @@ -27827,6 +27731,8 @@ if test "x${PBX_OGG}" != "x1" -a "${USE_OGG}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_OGG_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_ogg_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -logg" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -logg... $ECHO_C" >&6; } @@ -27896,6 +27802,7 @@ else AST_OGG_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -27909,7 +27816,7 @@ fi if test "x" = "x" ; then # no header, assume found OGG_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OGG_INCLUDE}" if test "${ac_cv_header_+set}" = set; then { echo "$as_me:$LINENO: checking for " >&5 @@ -28048,7 +27955,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${OGG_HEADER_FOUND}" = "x0" ; then OGG_LIB="" @@ -28060,13 +27967,14 @@ fi PBX_OGG=1 cat >>confdefs.h <<_ACEOF #define HAVE_OGG 1 -#define HAVE_OGG_VERSION _ACEOF + fi fi fi + # Non-glibc platforms require libexecinfo for backtrace support if test "x${PBX_BKTR}" != "x1" -a "${USE_BKTR}" != "no"; then @@ -28083,6 +27991,8 @@ if test "x${PBX_BKTR}" != "x1" -a "${USE_BKTR}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_BKTR_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_execinfo_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lexecinfo" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lexecinfo... $ECHO_C" >&6; } @@ -28152,6 +28062,7 @@ else AST_BKTR_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -28165,7 +28076,7 @@ fi if test "xexecinfo.h" = "x" ; then # no header, assume found BKTR_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${BKTR_INCLUDE}" if test "${ac_cv_header_execinfo_h+set}" = set; then { echo "$as_me:$LINENO: checking for execinfo.h" >&5 @@ -28304,7 +28215,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${BKTR_HEADER_FOUND}" = "x0" ; then BKTR_LIB="" @@ -28316,12 +28227,13 @@ fi PBX_BKTR=1 cat >>confdefs.h <<_ACEOF #define HAVE_BKTR 1 -#define HAVE_BKTR_VERSION _ACEOF + fi fi fi + # Linux, however, has backtrace directly in glibc if test "x${PBX_BKTR}" != "x1" -a "${USE_BKTR}" != "no"; then @@ -28338,6 +28250,8 @@ if test "x${PBX_BKTR}" != "x1" -a "${USE_BKTR}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_BKTR_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_c_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lc" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lc... $ECHO_C" >&6; } @@ -28407,6 +28321,7 @@ else AST_BKTR_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -28420,7 +28335,7 @@ fi if test "xexecinfo.h" = "x" ; then # no header, assume found BKTR_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${BKTR_INCLUDE}" if test "${ac_cv_header_execinfo_h+set}" = set; then { echo "$as_me:$LINENO: checking for execinfo.h" >&5 @@ -28559,7 +28474,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${BKTR_HEADER_FOUND}" = "x0" ; then BKTR_LIB="" @@ -28571,13 +28486,14 @@ fi PBX_BKTR=1 cat >>confdefs.h <<_ACEOF #define HAVE_BKTR 1 -#define HAVE_BKTR_VERSION _ACEOF + fi fi fi + # possible places for oss definitions if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then @@ -28594,6 +28510,8 @@ if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_OSS_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_ossaudio_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lossaudio" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lossaudio... $ECHO_C" >&6; } @@ -28663,6 +28581,7 @@ else AST_OSS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -28676,7 +28595,7 @@ fi if test "xlinux/soundcard.h" = "x" ; then # no header, assume found OSS_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}" if test "${ac_cv_header_linux_soundcard_h+set}" = set; then { echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5 @@ -28815,7 +28734,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${OSS_HEADER_FOUND}" = "x0" ; then OSS_LIB="" @@ -28827,13 +28746,14 @@ fi PBX_OSS=1 cat >>confdefs.h <<_ACEOF #define HAVE_OSS 1 -#define HAVE_OSS_VERSION _ACEOF + fi fi fi + if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then pbxlibdir="" # if --with-OSS=DIR has been specified, use it. @@ -28848,6 +28768,8 @@ if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_OSS_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_ossaudio_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lossaudio" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lossaudio... $ECHO_C" >&6; } @@ -28917,6 +28839,7 @@ else AST_OSS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -28930,7 +28853,7 @@ fi if test "xsys/soundcard.h" = "x" ; then # no header, assume found OSS_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}" if test "${ac_cv_header_sys_soundcard_h+set}" = set; then { echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 @@ -29069,7 +28992,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${OSS_HEADER_FOUND}" = "x0" ; then OSS_LIB="" @@ -29081,13 +29004,14 @@ fi PBX_OSS=1 cat >>confdefs.h <<_ACEOF #define HAVE_OSS 1 -#define HAVE_OSS_VERSION _ACEOF + fi fi fi + if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then pbxlibdir="" # if --with-OSS=DIR has been specified, use it. @@ -29102,6 +29026,8 @@ if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_OSS_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_ossaudio_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lossaudio" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lossaudio... $ECHO_C" >&6; } @@ -29171,6 +29097,7 @@ else AST_OSS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -29184,7 +29111,7 @@ fi if test "xsoundcard.h" = "x" ; then # no header, assume found OSS_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}" if test "${ac_cv_header_soundcard_h+set}" = set; then { echo "$as_me:$LINENO: checking for soundcard.h" >&5 @@ -29323,7 +29250,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${OSS_HEADER_FOUND}" = "x0" ; then OSS_LIB="" @@ -29335,13 +29262,14 @@ fi PBX_OSS=1 cat >>confdefs.h <<_ACEOF #define HAVE_OSS 1 -#define HAVE_OSS_VERSION _ACEOF + fi fi fi + PG_CONFIG=No if test "${USE_PGSQL}" != "no"; then if test "x${PGSQL_DIR}" != "x"; then @@ -29685,6 +29613,8 @@ if test "x${PBX_POPT}" != "x1" -a "${USE_POPT}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_POPT_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_popt_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lpopt" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lpopt... $ECHO_C" >&6; } @@ -29754,6 +29684,7 @@ else AST_POPT_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -29767,7 +29698,7 @@ fi if test "xpopt.h" = "x" ; then # no header, assume found POPT_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${POPT_INCLUDE}" if test "${ac_cv_header_popt_h+set}" = set; then { echo "$as_me:$LINENO: checking for popt.h" >&5 @@ -29906,7 +29837,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${POPT_HEADER_FOUND}" = "x0" ; then POPT_LIB="" @@ -29918,14 +29849,15 @@ fi PBX_POPT=1 cat >>confdefs.h <<_ACEOF #define HAVE_POPT 1 -#define HAVE_POPT_VERSION _ACEOF + fi fi fi + if test "x${PBX_PORTAUDIO}" != "x1" -a "${USE_PORTAUDIO}" != "no"; then pbxlibdir="" # if --with-PORTAUDIO=DIR has been specified, use it. @@ -29940,6 +29872,8 @@ if test "x${PBX_PORTAUDIO}" != "x1" -a "${USE_PORTAUDIO}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_PORTAUDIO_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_portaudio_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lportaudio" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lportaudio... $ECHO_C" >&6; } @@ -30009,6 +29943,7 @@ else AST_PORTAUDIO_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -30022,7 +29957,7 @@ fi if test "xportaudio.h" = "x" ; then # no header, assume found PORTAUDIO_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PORTAUDIO_INCLUDE}" if test "${ac_cv_header_portaudio_h+set}" = set; then { echo "$as_me:$LINENO: checking for portaudio.h" >&5 @@ -30161,7 +30096,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${PORTAUDIO_HEADER_FOUND}" = "x0" ; then PORTAUDIO_LIB="" @@ -30173,14 +30108,15 @@ fi PBX_PORTAUDIO=1 cat >>confdefs.h <<_ACEOF #define HAVE_PORTAUDIO 1 -#define HAVE_PORTAUDIO_VERSION _ACEOF + fi fi fi + if test "x${PBX_PRI}" != "x1" -a "${USE_PRI}" != "no"; then pbxlibdir="" # if --with-PRI=DIR has been specified, use it. @@ -30195,6 +30131,8 @@ if test "x${PBX_PRI}" != "x1" -a "${USE_PRI}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_PRI_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lpri" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lpri... $ECHO_C" >&6; } @@ -30264,6 +30202,7 @@ else AST_PRI_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -30277,7 +30216,7 @@ fi if test "xlibpri.h" = "x" ; then # no header, assume found PRI_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_INCLUDE}" if test "${ac_cv_header_libpri_h+set}" = set; then { echo "$as_me:$LINENO: checking for libpri.h" >&5 @@ -30416,7 +30355,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${PRI_HEADER_FOUND}" = "x0" ; then PRI_LIB="" @@ -30428,14 +30367,15 @@ fi PBX_PRI=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI 1 -#define HAVE_PRI_VERSION _ACEOF + fi fi fi + if test "x${PBX_PRI_PROG_W_CAUSE}" != "x1" -a "${USE_PRI_PROG_W_CAUSE}" != "no"; then pbxlibdir="" # if --with-PRI_PROG_W_CAUSE=DIR has been specified, use it. @@ -30450,6 +30390,8 @@ if test "x${PBX_PRI_PROG_W_CAUSE}" != "x1" -a "${USE_PRI_PROG_W_CAUSE}" != "no"; if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_PRI_PROG_W_CAUSE_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lpri" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lpri... $ECHO_C" >&6; } @@ -30519,6 +30461,7 @@ else AST_PRI_PROG_W_CAUSE_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -30532,7 +30475,7 @@ fi if test "xlibpri.h" = "x" ; then # no header, assume found PRI_PROG_W_CAUSE_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_PROG_W_CAUSE_INCLUDE}" if test "${ac_cv_header_libpri_h+set}" = set; then { echo "$as_me:$LINENO: checking for libpri.h" >&5 @@ -30671,7 +30614,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${PRI_PROG_W_CAUSE_HEADER_FOUND}" = "x0" ; then PRI_PROG_W_CAUSE_LIB="" @@ -30683,14 +30626,15 @@ fi PBX_PRI_PROG_W_CAUSE=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_PROG_W_CAUSE 1 -#define HAVE_PRI_PROG_W_CAUSE_VERSION _ACEOF + fi fi fi + if test "x${PBX_PRI_INBANDDISCONNECT}" != "x1" -a "${USE_PRI_INBANDDISCONNECT}" != "no"; then pbxlibdir="" # if --with-PRI_INBANDDISCONNECT=DIR has been specified, use it. @@ -30705,6 +30649,8 @@ if test "x${PBX_PRI_INBANDDISCONNECT}" != "x1" -a "${USE_PRI_INBANDDISCONNECT}" if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_PRI_INBANDDISCONNECT_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lpri" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lpri... $ECHO_C" >&6; } @@ -30774,6 +30720,7 @@ else AST_PRI_INBANDDISCONNECT_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -30787,7 +30734,7 @@ fi if test "xlibpri.h" = "x" ; then # no header, assume found PRI_INBANDDISCONNECT_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_INBANDDISCONNECT_INCLUDE}" if test "${ac_cv_header_libpri_h+set}" = set; then { echo "$as_me:$LINENO: checking for libpri.h" >&5 @@ -30926,7 +30873,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${PRI_INBANDDISCONNECT_HEADER_FOUND}" = "x0" ; then PRI_INBANDDISCONNECT_LIB="" @@ -30938,14 +30885,15 @@ fi PBX_PRI_INBANDDISCONNECT=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_INBANDDISCONNECT 1 -#define HAVE_PRI_INBANDDISCONNECT_VERSION _ACEOF + fi fi fi + if test "x${PBX_RESAMPLE}" != "x1" -a "${USE_RESAMPLE}" != "no"; then pbxlibdir="" # if --with-RESAMPLE=DIR has been specified, use it. @@ -30960,6 +30908,8 @@ if test "x${PBX_RESAMPLE}" != "x1" -a "${USE_RESAMPLE}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_RESAMPLE_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_resample_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lresample" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lresample... $ECHO_C" >&6; } @@ -31029,6 +30979,7 @@ else AST_RESAMPLE_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -31042,7 +30993,7 @@ fi if test "xlibresample.h" = "x" ; then # no header, assume found RESAMPLE_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${RESAMPLE_INCLUDE}" if test "${ac_cv_header_libresample_h+set}" = set; then { echo "$as_me:$LINENO: checking for libresample.h" >&5 @@ -31181,7 +31132,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${RESAMPLE_HEADER_FOUND}" = "x0" ; then RESAMPLE_LIB="" @@ -31193,14 +31144,15 @@ fi PBX_RESAMPLE=1 cat >>confdefs.h <<_ACEOF #define HAVE_RESAMPLE 1 -#define HAVE_RESAMPLE_VERSION _ACEOF + fi fi fi + if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then if test "xminimum version of SpanDSP" != "x"; then { echo "$as_me:$LINENO: checking for minimum version of SpanDSP" >&5 @@ -31269,10 +31221,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_SPANDSP_VERSION -_ACEOF - else echo "$as_me: failed program was:" >&5 @@ -31307,6 +31255,8 @@ if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_SPANDSP_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_spandsp_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspandsp" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lspandsp... $ECHO_C" >&6; } @@ -31376,6 +31326,7 @@ else AST_SPANDSP_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -31389,7 +31340,7 @@ fi if test "xspandsp.h" = "x" ; then # no header, assume found SPANDSP_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE}" if test "${ac_cv_header_spandsp_h+set}" = set; then { echo "$as_me:$LINENO: checking for spandsp.h" >&5 @@ -31528,7 +31479,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SPANDSP_HEADER_FOUND}" = "x0" ; then SPANDSP_LIB="" @@ -31540,12 +31491,13 @@ fi PBX_SPANDSP=1 cat >>confdefs.h <<_ACEOF #define HAVE_SPANDSP 1 -#define HAVE_SPANDSP_VERSION _ACEOF + fi fi fi + fi if test "x${PBX_SPANDSP}" = "x1" ; then @@ -31566,6 +31518,8 @@ if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_SPANDSP_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_spandsp_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspandsp" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lspandsp... $ECHO_C" >&6; } @@ -31635,6 +31589,7 @@ else AST_SPANDSP_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -31648,7 +31603,7 @@ fi if test "xspandsp.h" = "x" ; then # no header, assume found SPANDSP_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE}" if test "${ac_cv_header_spandsp_h+set}" = set; then { echo "$as_me:$LINENO: checking for spandsp.h" >&5 @@ -31787,7 +31742,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SPANDSP_HEADER_FOUND}" = "x0" ; then SPANDSP_LIB="" @@ -31799,12 +31754,13 @@ fi PBX_SPANDSP=1 cat >>confdefs.h <<_ACEOF #define HAVE_SPANDSP 1 -#define HAVE_SPANDSP_VERSION _ACEOF + fi fi fi + fi if test "x${PBX_SPANDSP}" = "x1" ; then @@ -31878,6 +31834,8 @@ if test "x${PBX_SS7}" != "x1" -a "${USE_SS7}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_SS7_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_ss7_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lss7" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lss7... $ECHO_C" >&6; } @@ -31947,6 +31905,7 @@ else AST_SS7_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -31960,7 +31919,7 @@ fi if test "xlibss7.h" = "x" ; then # no header, assume found SS7_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SS7_INCLUDE}" if test "${ac_cv_header_libss7_h+set}" = set; then { echo "$as_me:$LINENO: checking for libss7.h" >&5 @@ -32099,7 +32058,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SS7_HEADER_FOUND}" = "x0" ; then SS7_LIB="" @@ -32111,14 +32070,15 @@ fi PBX_SS7=1 cat >>confdefs.h <<_ACEOF #define HAVE_SS7 1 -#define HAVE_SS7_VERSION _ACEOF + fi fi fi + if test "x${PBX_OPENR2}" != "x1" -a "${USE_OPENR2}" != "no"; then pbxlibdir="" # if --with-OPENR2=DIR has been specified, use it. @@ -32133,6 +32093,8 @@ if test "x${PBX_OPENR2}" != "x1" -a "${USE_OPENR2}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_OPENR2_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_openr2_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lopenr2" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lopenr2... $ECHO_C" >&6; } @@ -32202,6 +32164,7 @@ else AST_OPENR2_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -32215,7 +32178,7 @@ fi if test "xopenr2.h" = "x" ; then # no header, assume found OPENR2_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OPENR2_INCLUDE}" if test "${ac_cv_header_openr2_h+set}" = set; then { echo "$as_me:$LINENO: checking for openr2.h" >&5 @@ -32354,7 +32317,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${OPENR2_HEADER_FOUND}" = "x0" ; then OPENR2_LIB="" @@ -32366,13 +32329,14 @@ fi PBX_OPENR2=1 cat >>confdefs.h <<_ACEOF #define HAVE_OPENR2 1 -#define HAVE_OPENR2_VERSION _ACEOF + fi fi fi + if test "${USE_PWLIB}" != "no"; then if test -n "${PWLIB_DIR}"; then PWLIBDIR="${PWLIB_DIR}" @@ -34243,6 +34207,8 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_LUA_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -llua5.1" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -llua5.1... $ECHO_C" >&6; } @@ -34312,6 +34278,7 @@ else AST_LUA_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -34325,7 +34292,7 @@ fi if test "xlua5.1/lua.h" = "x" ; then # no header, assume found LUA_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then { echo "$as_me:$LINENO: checking for lua5.1/lua.h" >&5 @@ -34464,7 +34431,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${LUA_HEADER_FOUND}" = "x0" ; then LUA_LIB="" @@ -34476,12 +34443,13 @@ fi PBX_LUA=1 cat >>confdefs.h <<_ACEOF #define HAVE_LUA 1 -#define HAVE_LUA_VERSION _ACEOF + fi fi fi + if test "x${PBX_LUA}" = "x1" ; then cat >>confdefs.h <<_ACEOF @@ -34506,6 +34474,8 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_LUA_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_lua_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -llua" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -llua... $ECHO_C" >&6; } @@ -34575,6 +34545,7 @@ else AST_LUA_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -34588,7 +34559,7 @@ fi if test "xlua.h" = "x" ; then # no header, assume found LUA_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" if test "${ac_cv_header_lua_h+set}" = set; then { echo "$as_me:$LINENO: checking for lua.h" >&5 @@ -34727,7 +34698,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${LUA_HEADER_FOUND}" = "x0" ; then LUA_LIB="" @@ -34739,14 +34710,15 @@ fi PBX_LUA=1 cat >>confdefs.h <<_ACEOF #define HAVE_LUA 1 -#define HAVE_LUA_VERSION _ACEOF + fi fi fi + if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then pbxlibdir="" # if --with-RADIUS=DIR has been specified, use it. @@ -34761,6 +34733,8 @@ if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_RADIUS_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_radiusclient-ng_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lradiusclient-ng" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lradiusclient-ng... $ECHO_C" >&6; } @@ -34830,6 +34804,7 @@ else AST_RADIUS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -34843,7 +34818,7 @@ fi if test "xradiusclient-ng.h" = "x" ; then # no header, assume found RADIUS_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE}" if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then { echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 @@ -34982,7 +34957,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then RADIUS_LIB="" @@ -34994,13 +34969,14 @@ fi PBX_RADIUS=1 cat >>confdefs.h <<_ACEOF #define HAVE_RADIUS 1 -#define HAVE_RADIUS_VERSION _ACEOF + fi fi fi + # This is a bit complex... in reality, Asterisk's AIS support is dependent on finding # *any* implementation of AIS, not just OpenAIS. However, the configure script needs # to know the specifics of each possible implementation, and then represent the one @@ -35025,6 +35001,8 @@ if test "x${PBX_OPENAIS}" != "x1" -a "${USE_OPENAIS}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_OPENAIS_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_SaClm_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lSaClm" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lSaClm... $ECHO_C" >&6; } @@ -35094,6 +35072,7 @@ else AST_OPENAIS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -35107,7 +35086,7 @@ fi if test "xopenais/saClm.h" = "x" ; then # no header, assume found OPENAIS_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OPENAIS_INCLUDE}" if test "${ac_cv_header_openais_saClm_h+set}" = set; then { echo "$as_me:$LINENO: checking for openais/saClm.h" >&5 @@ -35246,7 +35225,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${OPENAIS_HEADER_FOUND}" = "x0" ; then OPENAIS_LIB="" @@ -35258,13 +35237,14 @@ fi PBX_OPENAIS=1 cat >>confdefs.h <<_ACEOF #define HAVE_OPENAIS 1 -#define HAVE_OPENAIS_VERSION _ACEOF + fi fi fi + if test "${PBX_OPENAIS}" = 1; then PBX_AIS=1 if test -n "${OPENAIS_DIR}"; then @@ -35295,6 +35275,8 @@ if test "x${PBX_SPEEX}" != "x1" -a "${USE_SPEEX}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_SPEEX_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_speex_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspeex" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lspeex... $ECHO_C" >&6; } @@ -35364,6 +35346,7 @@ else AST_SPEEX_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -35377,7 +35360,7 @@ fi if test "xspeex/speex.h" = "x" ; then # no header, assume found SPEEX_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SPEEX_INCLUDE}" if test "${ac_cv_header_speex_speex_h+set}" = set; then { echo "$as_me:$LINENO: checking for speex/speex.h" >&5 @@ -35516,7 +35499,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SPEEX_HEADER_FOUND}" = "x0" ; then SPEEX_LIB="" @@ -35528,13 +35511,14 @@ fi PBX_SPEEX=1 cat >>confdefs.h <<_ACEOF #define HAVE_SPEEX 1 -#define HAVE_SPEEX_VERSION _ACEOF + fi fi fi + # See if the main speex library contains the preprocess functions if test "x${PBX_SPEEX_PREPROCESS}" != "x1" -a "${USE_SPEEX_PREPROCESS}" != "no"; then @@ -35551,6 +35535,8 @@ if test "x${PBX_SPEEX_PREPROCESS}" != "x1" -a "${USE_SPEEX_PREPROCESS}" != "no"; if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_SPEEX_PREPROCESS_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_speex_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspeex" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lspeex... $ECHO_C" >&6; } @@ -35620,6 +35606,7 @@ else AST_SPEEX_PREPROCESS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -35633,7 +35620,7 @@ fi if test "xspeex/speex.h" = "x" ; then # no header, assume found SPEEX_PREPROCESS_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SPEEX_PREPROCESS_INCLUDE}" if test "${ac_cv_header_speex_speex_h+set}" = set; then { echo "$as_me:$LINENO: checking for speex/speex.h" >&5 @@ -35772,7 +35759,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SPEEX_PREPROCESS_HEADER_FOUND}" = "x0" ; then SPEEX_PREPROCESS_LIB="" @@ -35784,12 +35771,13 @@ fi PBX_SPEEX_PREPROCESS=1 cat >>confdefs.h <<_ACEOF #define HAVE_SPEEX_PREPROCESS 1 -#define HAVE_SPEEX_PREPROCESS_VERSION _ACEOF + fi fi fi + if test "${PBX_SPEEX_PREPROCESS}" = 1; then PBX_SPEEX_PREPROCESS=1 fi @@ -35809,6 +35797,8 @@ if test "x${PBX_SPEEXDSP}" != "x1" -a "${USE_SPEEXDSP}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_SPEEXDSP_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_speexdsp_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspeexdsp" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lspeexdsp... $ECHO_C" >&6; } @@ -35878,6 +35868,7 @@ else AST_SPEEXDSP_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -35891,7 +35882,7 @@ fi if test "xspeex/speex.h" = "x" ; then # no header, assume found SPEEXDSP_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SPEEXDSP_INCLUDE}" if test "${ac_cv_header_speex_speex_h+set}" = set; then { echo "$as_me:$LINENO: checking for speex/speex.h" >&5 @@ -36030,7 +36021,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SPEEXDSP_HEADER_FOUND}" = "x0" ; then SPEEXDSP_LIB="" @@ -36042,12 +36033,13 @@ fi PBX_SPEEXDSP=1 cat >>confdefs.h <<_ACEOF #define HAVE_SPEEXDSP 1 -#define HAVE_SPEEXDSP_VERSION _ACEOF + fi fi fi + if test "${PBX_SPEEXDSP}" = 1; then PBX_SPEEX_PREPROCESS=1 fi @@ -36069,6 +36061,8 @@ if test "x${PBX_SQLITE}" != "x1" -a "${USE_SQLITE}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_SQLITE_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_sqlite_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lsqlite" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lsqlite... $ECHO_C" >&6; } @@ -36138,6 +36132,7 @@ else AST_SQLITE_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -36151,7 +36146,7 @@ fi if test "xsqlite.h" = "x" ; then # no header, assume found SQLITE_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SQLITE_INCLUDE}" if test "${ac_cv_header_sqlite_h+set}" = set; then { echo "$as_me:$LINENO: checking for sqlite.h" >&5 @@ -36290,7 +36285,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SQLITE_HEADER_FOUND}" = "x0" ; then SQLITE_LIB="" @@ -36302,14 +36297,15 @@ fi PBX_SQLITE=1 cat >>confdefs.h <<_ACEOF #define HAVE_SQLITE 1 -#define HAVE_SQLITE_VERSION _ACEOF + fi fi fi + if test "x${PBX_SQLITE3}" != "x1" -a "${USE_SQLITE3}" != "no"; then pbxlibdir="" # if --with-SQLITE3=DIR has been specified, use it. @@ -36324,6 +36320,8 @@ if test "x${PBX_SQLITE3}" != "x1" -a "${USE_SQLITE3}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_SQLITE3_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_sqlite3_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lsqlite3" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lsqlite3... $ECHO_C" >&6; } @@ -36393,6 +36391,7 @@ else AST_SQLITE3_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -36406,7 +36405,7 @@ fi if test "xsqlite3.h" = "x" ; then # no header, assume found SQLITE3_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SQLITE3_INCLUDE}" if test "${ac_cv_header_sqlite3_h+set}" = set; then { echo "$as_me:$LINENO: checking for sqlite3.h" >&5 @@ -36545,7 +36544,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SQLITE3_HEADER_FOUND}" = "x0" ; then SQLITE3_LIB="" @@ -36557,14 +36556,15 @@ fi PBX_SQLITE3=1 cat >>confdefs.h <<_ACEOF #define HAVE_SQLITE3 1 -#define HAVE_SQLITE3_VERSION _ACEOF + fi fi fi + if test "x${PBX_CRYPTO}" != "x1" -a "${USE_CRYPTO}" != "no"; then pbxlibdir="" # if --with-CRYPTO=DIR has been specified, use it. @@ -36579,6 +36579,8 @@ if test "x${PBX_CRYPTO}" != "x1" -a "${USE_CRYPTO}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_CRYPTO_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_crypto_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lcrypto" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lcrypto... $ECHO_C" >&6; } @@ -36648,6 +36650,7 @@ else AST_CRYPTO_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -36661,7 +36664,7 @@ fi if test "xopenssl/aes.h" = "x" ; then # no header, assume found CRYPTO_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${CRYPTO_INCLUDE}" if test "${ac_cv_header_openssl_aes_h+set}" = set; then { echo "$as_me:$LINENO: checking for openssl/aes.h" >&5 @@ -36800,7 +36803,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${CRYPTO_HEADER_FOUND}" = "x0" ; then CRYPTO_LIB="" @@ -36812,13 +36815,14 @@ fi PBX_CRYPTO=1 cat >>confdefs.h <<_ACEOF #define HAVE_CRYPTO 1 -#define HAVE_CRYPTO_VERSION _ACEOF + fi fi fi + if test "$PBX_CRYPTO" = "1"; then @@ -36836,6 +36840,8 @@ if test "x${PBX_OPENSSL}" != "x1" -a "${USE_OPENSSL}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_OPENSSL_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_ssl_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lssl" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lssl... $ECHO_C" >&6; } @@ -36905,6 +36911,7 @@ else AST_OPENSSL_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -36918,7 +36925,7 @@ fi if test "xopenssl/ssl.h" = "x" ; then # no header, assume found OPENSSL_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OPENSSL_INCLUDE}" if test "${ac_cv_header_openssl_ssl_h+set}" = set; then { echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5 @@ -37057,7 +37064,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${OPENSSL_HEADER_FOUND}" = "x0" ; then OPENSSL_LIB="" @@ -37069,12 +37076,13 @@ fi PBX_OPENSSL=1 cat >>confdefs.h <<_ACEOF #define HAVE_OPENSSL 1 -#define HAVE_OPENSSL_VERSION _ACEOF + fi fi fi + fi if test "$PBX_OPENSSL" = "1"; @@ -37585,6 +37593,8 @@ if test "x${PBX_HOARD}" != "x1" -a "${USE_HOARD}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_HOARD_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_hoard_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lhoard" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lhoard... $ECHO_C" >&6; } @@ -37654,6 +37664,7 @@ else AST_HOARD_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -37667,7 +37678,7 @@ fi if test "x" = "x" ; then # no header, assume found HOARD_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${HOARD_INCLUDE}" if test "${ac_cv_header_+set}" = set; then { echo "$as_me:$LINENO: checking for " >&5 @@ -37806,7 +37817,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${HOARD_HEADER_FOUND}" = "x0" ; then HOARD_LIB="" @@ -37818,14 +37829,15 @@ fi PBX_HOARD=1 cat >>confdefs.h <<_ACEOF #define HAVE_HOARD 1 -#define HAVE_HOARD_VERSION _ACEOF + fi fi fi + if test "x${PBX_FREETDS}" != "x1" -a "${USE_FREETDS}" != "no"; then pbxlibdir="" # if --with-FREETDS=DIR has been specified, use it. @@ -37840,6 +37852,8 @@ if test "x${PBX_FREETDS}" != "x1" -a "${USE_FREETDS}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_FREETDS_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_sybdb_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lsybdb" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lsybdb... $ECHO_C" >&6; } @@ -37909,6 +37923,7 @@ else AST_FREETDS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -37922,7 +37937,7 @@ fi if test "xsybdb.h" = "x" ; then # no header, assume found FREETDS_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${FREETDS_INCLUDE}" if test "${ac_cv_header_sybdb_h+set}" = set; then { echo "$as_me:$LINENO: checking for sybdb.h" >&5 @@ -38061,7 +38076,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${FREETDS_HEADER_FOUND}" = "x0" ; then FREETDS_LIB="" @@ -38073,14 +38088,15 @@ fi PBX_FREETDS=1 cat >>confdefs.h <<_ACEOF #define HAVE_FREETDS 1 -#define HAVE_FREETDS_VERSION _ACEOF + fi fi fi + if test "x${PBX_TERMCAP}" != "x1" -a "${USE_TERMCAP}" != "no"; then pbxlibdir="" # if --with-TERMCAP=DIR has been specified, use it. @@ -38095,6 +38111,8 @@ if test "x${PBX_TERMCAP}" != "x1" -a "${USE_TERMCAP}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_TERMCAP_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_termcap_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -ltermcap" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -ltermcap... $ECHO_C" >&6; } @@ -38164,6 +38182,7 @@ else AST_TERMCAP_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -38177,7 +38196,7 @@ fi if test "x" = "x" ; then # no header, assume found TERMCAP_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${TERMCAP_INCLUDE}" if test "${ac_cv_header_+set}" = set; then { echo "$as_me:$LINENO: checking for " >&5 @@ -38316,7 +38335,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${TERMCAP_HEADER_FOUND}" = "x0" ; then TERMCAP_LIB="" @@ -38328,14 +38347,15 @@ fi PBX_TERMCAP=1 cat >>confdefs.h <<_ACEOF #define HAVE_TERMCAP 1 -#define HAVE_TERMCAP_VERSION _ACEOF + fi fi fi + if test "x${PBX_TINFO}" != "x1" -a "${USE_TINFO}" != "no"; then pbxlibdir="" # if --with-TINFO=DIR has been specified, use it. @@ -38350,6 +38370,8 @@ if test "x${PBX_TINFO}" != "x1" -a "${USE_TINFO}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_TINFO_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_tinfo_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -ltinfo" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -ltinfo... $ECHO_C" >&6; } @@ -38419,6 +38441,7 @@ else AST_TINFO_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -38432,7 +38455,7 @@ fi if test "x" = "x" ; then # no header, assume found TINFO_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${TINFO_INCLUDE}" if test "${ac_cv_header_+set}" = set; then { echo "$as_me:$LINENO: checking for " >&5 @@ -38571,7 +38594,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${TINFO_HEADER_FOUND}" = "x0" ; then TINFO_LIB="" @@ -38583,13 +38606,14 @@ fi PBX_TINFO=1 cat >>confdefs.h <<_ACEOF #define HAVE_TINFO 1 -#define HAVE_TINFO_VERSION _ACEOF + fi fi fi + { echo "$as_me:$LINENO: checking for tone_zone_find_by_num in -ltonezone" >&5 echo $ECHO_N "checking for tone_zone_find_by_num in -ltonezone... $ECHO_C" >&6; } if test "${ac_cv_lib_tonezone_tone_zone_find_by_num+set}" = set; then @@ -38677,6 +38701,8 @@ if test "x${PBX_TONEZONE}" != "x1" -a "${USE_TONEZONE}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_TONEZONE_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_tonezone_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -ltonezone" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -ltonezone... $ECHO_C" >&6; } @@ -38746,6 +38772,7 @@ else AST_TONEZONE_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -38759,7 +38786,7 @@ fi if test "xdahdi/tonezone.h" = "x" ; then # no header, assume found TONEZONE_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${TONEZONE_INCLUDE}" if test "${ac_cv_header_dahdi_tonezone_h+set}" = set; then { echo "$as_me:$LINENO: checking for dahdi/tonezone.h" >&5 @@ -38898,7 +38925,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${TONEZONE_HEADER_FOUND}" = "x0" ; then TONEZONE_LIB="" @@ -38910,14 +38937,15 @@ fi PBX_TONEZONE=1 cat >>confdefs.h <<_ACEOF #define HAVE_TONEZONE 1 -#define HAVE_TONEZONE_VERSION _ACEOF + fi fi fi + if test "x${PBX_USB}" != "x1" -a "${USE_USB}" != "no"; then pbxlibdir="" # if --with-USB=DIR has been specified, use it. @@ -38932,6 +38960,8 @@ if test "x${PBX_USB}" != "x1" -a "${USE_USB}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_USB_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_usb_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lusb" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lusb... $ECHO_C" >&6; } @@ -39001,6 +39031,7 @@ else AST_USB_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -39014,7 +39045,7 @@ fi if test "xusb.h" = "x" ; then # no header, assume found USB_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${USB_INCLUDE}" if test "${ac_cv_header_usb_h+set}" = set; then { echo "$as_me:$LINENO: checking for usb.h" >&5 @@ -39153,7 +39184,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${USB_HEADER_FOUND}" = "x0" ; then USB_LIB="" @@ -39165,13 +39196,14 @@ fi PBX_USB=1 cat >>confdefs.h <<_ACEOF #define HAVE_USB 1 -#define HAVE_USB_VERSION _ACEOF + fi fi fi + if test "${OSARCH}" = "OpenBSD"; then @@ -39189,6 +39221,8 @@ if test "x${PBX_VORBIS}" != "x1" -a "${USE_VORBIS}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_VORBIS_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_vorbis_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lvorbis" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lvorbis... $ECHO_C" >&6; } @@ -39258,6 +39292,7 @@ else AST_VORBIS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -39271,7 +39306,7 @@ fi if test "xvorbis/codec.h" = "x" ; then # no header, assume found VORBIS_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${VORBIS_INCLUDE}" if test "${ac_cv_header_vorbis_codec_h+set}" = set; then { echo "$as_me:$LINENO: checking for vorbis/codec.h" >&5 @@ -39410,7 +39445,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${VORBIS_HEADER_FOUND}" = "x0" ; then VORBIS_LIB="" @@ -39422,12 +39457,13 @@ fi PBX_VORBIS=1 cat >>confdefs.h <<_ACEOF #define HAVE_VORBIS 1 -#define HAVE_VORBIS_VERSION _ACEOF + fi fi fi + else if test "x${PBX_VORBIS}" != "x1" -a "${USE_VORBIS}" != "no"; then @@ -39444,6 +39480,8 @@ if test "x${PBX_VORBIS}" != "x1" -a "${USE_VORBIS}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_VORBIS_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_vorbis_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lvorbis" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lvorbis... $ECHO_C" >&6; } @@ -39513,6 +39551,7 @@ else AST_VORBIS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -39526,7 +39565,7 @@ fi if test "xvorbis/codec.h" = "x" ; then # no header, assume found VORBIS_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${VORBIS_INCLUDE}" if test "${ac_cv_header_vorbis_codec_h+set}" = set; then { echo "$as_me:$LINENO: checking for vorbis/codec.h" >&5 @@ -39665,7 +39704,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${VORBIS_HEADER_FOUND}" = "x0" ; then VORBIS_LIB="" @@ -39677,12 +39716,13 @@ fi PBX_VORBIS=1 cat >>confdefs.h <<_ACEOF #define HAVE_VORBIS 1 -#define HAVE_VORBIS_VERSION _ACEOF + fi fi fi + fi ac_ext=cpp @@ -39799,6 +39839,8 @@ if test "x${PBX_ZLIB}" != "x1" -a "${USE_ZLIB}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_ZLIB_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_z_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lz" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lz... $ECHO_C" >&6; } @@ -39868,6 +39910,7 @@ else AST_ZLIB_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -39881,7 +39924,7 @@ fi if test "xzlib.h" = "x" ; then # no header, assume found ZLIB_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ZLIB_INCLUDE}" if test "${ac_cv_header_zlib_h+set}" = set; then { echo "$as_me:$LINENO: checking for zlib.h" >&5 @@ -40020,7 +40063,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${ZLIB_HEADER_FOUND}" = "x0" ; then ZLIB_LIB="" @@ -40032,13 +40075,14 @@ fi PBX_ZLIB=1 cat >>confdefs.h <<_ACEOF #define HAVE_ZLIB 1 -#define HAVE_ZLIB_VERSION _ACEOF + fi fi fi + EDITLINE_LIB="" if test "x$TERMCAP_LIB" != "x" ; then EDITLINE_LIB="$TERMCAP_LIB" @@ -40643,6 +40687,8 @@ if test "x${PBX_SDL_IMAGE}" != "x1" -a "${USE_SDL_IMAGE}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_SDL_IMAGE_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} ${SDL_INCLUDE}" as_ac_Lib=`echo "ac_cv_lib_SDL_image_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lSDL_image" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lSDL_image... $ECHO_C" >&6; } @@ -40712,6 +40758,7 @@ else AST_SDL_IMAGE_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -40725,7 +40772,7 @@ fi if test "xSDL_image.h" = "x" ; then # no header, assume found SDL_IMAGE_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SDL_IMAGE_INCLUDE}" if test "${ac_cv_header_SDL_image_h+set}" = set; then { echo "$as_me:$LINENO: checking for SDL_image.h" >&5 @@ -40864,7 +40911,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SDL_IMAGE_HEADER_FOUND}" = "x0" ; then SDL_IMAGE_LIB="" @@ -40876,13 +40923,14 @@ fi PBX_SDL_IMAGE=1 cat >>confdefs.h <<_ACEOF #define HAVE_SDL_IMAGE 1 -#define HAVE_SDL_IMAGE_VERSION _ACEOF + fi fi fi + if test "x${PBX_FFMPEG}" != "x1" -a "${USE_FFMPEG}" != "no"; then pbxlibdir="" # if --with-FFMPEG=DIR has been specified, use it. @@ -40897,6 +40945,8 @@ if test "x${PBX_FFMPEG}" != "x1" -a "${USE_FFMPEG}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_FFMPEG_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" as_ac_Lib=`echo "ac_cv_lib_avcodec_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lavcodec" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lavcodec... $ECHO_C" >&6; } @@ -40966,6 +41016,7 @@ else AST_FFMPEG_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -40979,7 +41030,7 @@ fi if test "xffmpeg/avcodec.h" = "x" ; then # no header, assume found FFMPEG_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${FFMPEG_INCLUDE}" if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then { echo "$as_me:$LINENO: checking for ffmpeg/avcodec.h" >&5 @@ -41118,7 +41169,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${FFMPEG_HEADER_FOUND}" = "x0" ; then FFMPEG_LIB="" @@ -41130,13 +41181,14 @@ fi PBX_FFMPEG=1 cat >>confdefs.h <<_ACEOF #define HAVE_FFMPEG 1 -#define HAVE_FFMPEG_VERSION _ACEOF + fi fi fi + # possible places for video4linux version 1 if test "${ac_cv_header_linux_videodev_h+set}" = set; then { echo "$as_me:$LINENO: checking for linux/videodev.h" >&5 @@ -41294,6 +41346,8 @@ if test "x${PBX_X11}" != "x1" -a "${USE_X11}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_X11_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " as_ac_Lib=`echo "ac_cv_lib_X11_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lX11" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lX11... $ECHO_C" >&6; } @@ -41363,6 +41417,7 @@ else AST_X11_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -41376,7 +41431,7 @@ fi if test "xX11/Xlib.h" = "x" ; then # no header, assume found X11_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE}" if test "${ac_cv_header_X11_Xlib_h+set}" = set; then { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5 @@ -41515,7 +41570,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${X11_HEADER_FOUND}" = "x0" ; then X11_LIB="" @@ -41527,13 +41582,19 @@ fi PBX_X11=1 cat >>confdefs.h <<_ACEOF #define HAVE_X11 1 +_ACEOF + + cat >>confdefs.h <<_ACEOF #define HAVE_X11_VERSION standard_path _ACEOF + fi fi fi + + if test "x${PBX_X11}" != "x1" -a "${USE_X11}" != "no"; then pbxlibdir="" # if --with-X11=DIR has been specified, use it. @@ -41548,6 +41609,8 @@ if test "x${PBX_X11}" != "x1" -a "${USE_X11}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_X11_FOUND=yes else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} -I/usr/X11R6/include" as_ac_Lib=`echo "ac_cv_lib_X11_${pbxfuncname}" | $as_tr_sh` { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lX11" >&5 echo $ECHO_N "checking for ${pbxfuncname} in -lX11... $ECHO_C" >&6; } @@ -41617,6 +41680,7 @@ else AST_X11_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -41630,7 +41694,7 @@ fi if test "xX11/Xlib.h" = "x" ; then # no header, assume found X11_HEADER_FOUND="1" else # check for the header - saved_cppflags="${CPPFLAGS}" + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE}" if test "${ac_cv_header_X11_Xlib_h+set}" = set; then { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5 @@ -41769,7 +41833,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${X11_HEADER_FOUND}" = "x0" ; then X11_LIB="" @@ -41781,13 +41845,19 @@ fi PBX_X11=1 cat >>confdefs.h <<_ACEOF #define HAVE_X11 1 +_ACEOF + + cat >>confdefs.h <<_ACEOF #define HAVE_X11_VERSION X11R6 _ACEOF + fi fi fi + + if test "${cross_compiling}" = "no"; then { echo "$as_me:$LINENO: checking for /sbin/launchd" >&5 diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 35afe5861..48ff4e783 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -41,9 +41,6 @@ /* Define to 1 if you have the Advanced Linux Sound Architecture library. */ #undef HAVE_ALSA -/* Define to the version of the Advanced Linux Sound Architecture library. */ -#undef HAVE_ALSA_VERSION - /* Define to 1 if you have the <arpa/inet.h> header file. */ #undef HAVE_ARPA_INET_H @@ -112,18 +109,12 @@ /* Define to 1 if you have the Stack Backtrace library. */ #undef HAVE_BKTR -/* Define to the version of the Stack Backtrace library. */ -#undef HAVE_BKTR_VERSION - /* Define to 1 if byteswap.h macros are available. */ #undef HAVE_BYTESWAP_H /* Define to 1 if you have the POSIX 1.e capabilities library. */ #undef HAVE_CAP -/* Define to the version of the POSIX 1.e capabilities library. */ -#undef HAVE_CAP_VERSION - /* Define to 1 if you have the `ceil' function. */ #undef HAVE_CEIL @@ -145,39 +136,21 @@ /* Define to 1 if you have the OpenSSL Cryptography library. */ #undef HAVE_CRYPTO -/* Define to the version of the OpenSSL Cryptography library. */ -#undef HAVE_CRYPTO_VERSION - /* Define to 1 if you have a functional curl library. */ #undef HAVE_CURL -/* Define to the version of the cURL library. */ -#undef HAVE_CURL_VERSION - /* Define to 1 if you have the curses library. */ #undef HAVE_CURSES -/* Define to the version of the curses library. */ -#undef HAVE_CURSES_VERSION - /* Define if your system has the DAHDI headers. */ #undef HAVE_DAHDI /* Define if your system has the DAHDI_HALF_FULL headers. */ #undef HAVE_DAHDI_HALF_FULL -/* Define DAHDI_HALF_FULL headers version */ -#undef HAVE_DAHDI_HALF_FULL_VERSION - /* Define if your system has the DAHDI_LINEREVERSE_VMWI headers. */ #undef HAVE_DAHDI_LINEREVERSE_VMWI -/* Define DAHDI_LINEREVERSE_VMWI headers version */ -#undef HAVE_DAHDI_LINEREVERSE_VMWI_VERSION - -/* Define DAHDI headers version */ -#undef HAVE_DAHDI_VERSION - /* Define to 1 if your system has /dev/urandom. */ #undef HAVE_DEV_URANDOM @@ -224,9 +197,6 @@ /* Define to 1 if you have the Ffmpeg and avcodec library. */ #undef HAVE_FFMPEG -/* Define to the version of the Ffmpeg and avcodec library. */ -#undef HAVE_FFMPEG_VERSION - /* Define to 1 if you have the `floor' function. */ #undef HAVE_FLOOR @@ -248,9 +218,6 @@ /* Define to 1 if you have the FreeTDS library. */ #undef HAVE_FREETDS -/* Define to the version of the FreeTDS library. */ -#undef HAVE_FREETDS_VERSION - /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ #undef HAVE_FSEEKO @@ -281,9 +248,6 @@ /* Define if your system has the GETIFADDRS headers. */ #undef HAVE_GETIFADDRS -/* Define GETIFADDRS headers version */ -#undef HAVE_GETIFADDRS_VERSION - /* Define to 1 if you have the `getloadavg' function. */ #undef HAVE_GETLOADAVG @@ -302,9 +266,6 @@ /* Define if your system has the GMIME libraries. */ #undef HAVE_GMIME -/* Define to the version of the GMime library. */ -#undef HAVE_GMIME_VERSION - /* Define to indicate the GSM library */ #undef HAVE_GSM @@ -314,39 +275,21 @@ /* Define to indicate that gsm.h has no prefix for its location */ #undef HAVE_GSM_HEADER -/* Define to the version of the External GSM library. */ -#undef HAVE_GSM_VERSION - /* Define if your system has the GTK libraries. */ #undef HAVE_GTK /* Define if your system has the GTK2 libraries. */ #undef HAVE_GTK2 -/* Define to the version of the gtk2 library. */ -#undef HAVE_GTK2_VERSION - -/* Define to the version of the gtk library. */ -#undef HAVE_GTK_VERSION - /* Define to 1 if you have the Hoard Memory Allocator library. */ #undef HAVE_HOARD -/* Define to the version of the Hoard Memory Allocator library. */ -#undef HAVE_HOARD_VERSION - /* Define to 1 if you have the Iconv library. */ #undef HAVE_ICONV -/* Define to the version of the Iconv library. */ -#undef HAVE_ICONV_VERSION - /* Define to 1 if you have the Iksemel Jabber library. */ #undef HAVE_IKSEMEL -/* Define to the version of the Iksemel Jabber library. */ -#undef HAVE_IKSEMEL_VERSION - /* Define if your system has the UW IMAP Toolkit c-client library. */ #undef HAVE_IMAP_TK @@ -354,9 +297,6 @@ or greater. */ #undef HAVE_IMAP_TK2006 -/* Define to the version of the UW IMAP Toolkit library. */ -#undef HAVE_IMAP_TK_VERSION - /* Define to 1 if you have the `inet_aton' function. */ #undef HAVE_INET_ATON @@ -366,48 +306,30 @@ /* Define to 1 if you have the inotify support library. */ #undef HAVE_INOTIFY -/* Define to the version of the inotify support library. */ -#undef HAVE_INOTIFY_VERSION - /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H /* Define to 1 if you have the iODBC library. */ #undef HAVE_IODBC -/* Define to the version of the iODBC library. */ -#undef HAVE_IODBC_VERSION - /* Define to 1 if you have the `ioperm' function. */ #undef HAVE_IOPERM /* Define if your system has the IP_MTU_DISCOVER headers. */ #undef HAVE_IP_MTU_DISCOVER -/* Define IP_MTU_DISCOVER headers version */ -#undef HAVE_IP_MTU_DISCOVER_VERSION - /* Define to 1 if you have the `isascii' function. */ #undef HAVE_ISASCII /* Define to 1 if you have the ISDN4Linux library. */ #undef HAVE_ISDNNET -/* Define to the version of the ISDN4Linux library. */ -#undef HAVE_ISDNNET_VERSION - /* Define to 1 if you have the Jack Audio Connection Kit library. */ #undef HAVE_JACK -/* Define to the version of the Jack Audio Connection Kit library. */ -#undef HAVE_JACK_VERSION - /* Define to 1 if you have the OpenLDAP library. */ #undef HAVE_LDAP -/* Define to the version of the OpenLDAP library. */ -#undef HAVE_LDAP_VERSION - /* Define to 1 if you have the <libintl.h> header file. */ #undef HAVE_LIBINTL_H @@ -417,9 +339,6 @@ /* Define if your system has the LIBXML2 libraries. */ #undef HAVE_LIBXML2 -/* Define to the version of the LibXML2 library. */ -#undef HAVE_LIBXML2_VERSION - /* Define to 1 if you have the <limits.h> header file. */ #undef HAVE_LIMITS_H @@ -453,15 +372,9 @@ /* Define to 1 if you have the libtool library. */ #undef HAVE_LTDL -/* Define to the version of the libtool library. */ -#undef HAVE_LTDL_VERSION - /* Define to 1 if you have the Lua library. */ #undef HAVE_LUA -/* Define to the version of the Lua library. */ -#undef HAVE_LUA_VERSION - /* Define to 1 if you have the <malloc.h> header file. */ #undef HAVE_MALLOC_H @@ -483,18 +396,9 @@ /* Define if your system has the MISDN_FAC_ERROR headers. */ #undef HAVE_MISDN_FAC_ERROR -/* Define MISDN_FAC_ERROR headers version */ -#undef HAVE_MISDN_FAC_ERROR_VERSION - /* Define if your system has the MISDN_FAC_RESULT headers. */ #undef HAVE_MISDN_FAC_RESULT -/* Define MISDN_FAC_RESULT headers version */ -#undef HAVE_MISDN_FAC_RESULT_VERSION - -/* Define to the version of the mISDN user library. */ -#undef HAVE_MISDN_VERSION - /* Define to 1 if you have the `mkdir' function. */ #undef HAVE_MKDIR @@ -507,15 +411,9 @@ /* Define to 1 if you have the Network Broadcast Sound library. */ #undef HAVE_NBS -/* Define to the version of the Network Broadcast Sound library. */ -#undef HAVE_NBS_VERSION - /* Define to 1 if you have the ncurses library. */ #undef HAVE_NCURSES -/* Define to the version of the ncurses library. */ -#undef HAVE_NCURSES_VERSION - /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ #undef HAVE_NDIR_H @@ -528,15 +426,9 @@ /* Define if your system has the NETSNMP libraries. */ #undef HAVE_NETSNMP -/* Define to the version of the Net-SNMP library. */ -#undef HAVE_NETSNMP_VERSION - /* Define to 1 if you have the newt library. */ #undef HAVE_NEWT -/* Define to the version of the newt library. */ -#undef HAVE_NEWT_VERSION - /* Define to 1 if your C library can safely print NULL to string formats. */ #undef HAVE_NULLSAFE_PRINTF @@ -546,69 +438,39 @@ /* Define to 1 if you have the OGG library. */ #undef HAVE_OGG -/* Define to the version of the OGG library. */ -#undef HAVE_OGG_VERSION - /* Define to 1 if you have the OpenAIS library. */ #undef HAVE_OPENAIS -/* Define to the version of the OpenAIS library. */ -#undef HAVE_OPENAIS_VERSION - /* Define if your system has the OpenH323 libraries. */ #undef HAVE_OPENH323 -/* Define to the version of the OpenH323 library. */ -#undef HAVE_OPENH323_VERSION - /* Define to 1 if you have the MFR2 library. */ #undef HAVE_OPENR2 -/* Define to the version of the MFR2 library. */ -#undef HAVE_OPENR2_VERSION - /* Define to 1 if you have the OpenSSL Secure Sockets Layer library. */ #undef HAVE_OPENSSL -/* Define to the version of the OpenSSL Secure Sockets Layer library. */ -#undef HAVE_OPENSSL_VERSION - /* Define this to indicate the ${OSPTK_DESCRIP} library */ #undef HAVE_OSPTK -/* Define to the version of the OSP Toolkit library. */ -#undef HAVE_OSPTK_VERSION - /* Define to 1 if you have the Open Sound System library. */ #undef HAVE_OSS -/* Define to the version of the Open Sound System library. */ -#undef HAVE_OSS_VERSION - /* Define to 1 if OSX atomic operations are supported. */ #undef HAVE_OSX_ATOMICS /* Define to indicate the PostgreSQL library */ #undef HAVE_PGSQL -/* Define to the version of the PostgreSQL library. */ -#undef HAVE_PGSQL_VERSION - /* Define to 1 if your system defines IP_PKTINFO. */ #undef HAVE_PKTINFO /* Define to 1 if you have the popt library. */ #undef HAVE_POPT -/* Define to the version of the popt library. */ -#undef HAVE_POPT_VERSION - /* Define to 1 if you have the PortAudio library. */ #undef HAVE_PORTAUDIO -/* Define to the version of the PortAudio library. */ -#undef HAVE_PORTAUDIO_VERSION - /* Define to 1 if you have the `pow' function. */ #undef HAVE_POW @@ -621,9 +483,6 @@ /* Define to 1 if you have the ISDN PRI set_inbanddisconnect library. */ #undef HAVE_PRI_INBANDDISCONNECT -/* Define to the version of the ISDN PRI library. */ -#undef HAVE_PRI_VERSION - /* Define if you have POSIX threads libraries and header files. */ #undef HAVE_PTHREAD @@ -635,15 +494,9 @@ headers. */ #undef HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP -/* Define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP headers version */ -#undef HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP_VERSION - /* Define if your system has the PTHREAD_RWLOCK_INITIALIZER headers. */ #undef HAVE_PTHREAD_RWLOCK_INITIALIZER -/* Define PTHREAD_RWLOCK_INITIALIZER headers version */ -#undef HAVE_PTHREAD_RWLOCK_INITIALIZER_VERSION - /* Define to 1 if your system defines PTHREAD_RWLOCK_PREFER_WRITER_NP in pthread.h */ #undef HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP @@ -660,15 +513,9 @@ /* Define if your system has the PWLib libraries. */ #undef HAVE_PWLIB -/* Define to the version of the PWlib library. */ -#undef HAVE_PWLIB_VERSION - /* Define to 1 if you have the Radius Client library. */ #undef HAVE_RADIUS -/* Define to the version of the Radius Client library. */ -#undef HAVE_RADIUS_VERSION - /* Define to 1 if you have the `regcomp' function. */ #undef HAVE_REGCOMP @@ -681,9 +528,6 @@ /* Define to 1 if you have the LIBRESAMPLE library. */ #undef HAVE_RESAMPLE -/* Define to the version of the LIBRESAMPLE library. */ -#undef HAVE_RESAMPLE_VERSION - /* Define to 1 if your system has the ndestroy resolver function. */ #undef HAVE_RES_NDESTROY @@ -714,12 +558,6 @@ /* Define to 1 if you have the Sdl Image library. */ #undef HAVE_SDL_IMAGE -/* Define to the version of the Sdl Image library. */ -#undef HAVE_SDL_IMAGE_VERSION - -/* Define to the version of the Sdl library. */ -#undef HAVE_SDL_VERSION - /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT @@ -744,48 +582,27 @@ /* Define to 1 if spandsp/expose.h is available. */ #undef HAVE_SPANDSP_EXPOSE_H -/* Define SPANDSP headers version */ -#undef HAVE_SPANDSP_VERSION - /* Define to 1 if you have the Speex library. */ #undef HAVE_SPEEX /* Define to 1 if you have the SpeexDSP library. */ #undef HAVE_SPEEXDSP -/* Define to the version of the SpeexDSP library. */ -#undef HAVE_SPEEXDSP_VERSION - /* Define to 1 if you have the speex_preprocess_ctl library. */ #undef HAVE_SPEEX_PREPROCESS -/* Define to the version of the Speex preprocess routines library. */ -#undef HAVE_SPEEX_PREPROCESS_VERSION - -/* Define to the version of the Speex library. */ -#undef HAVE_SPEEX_VERSION - /* Define to 1 if you have the SQLite library. */ #undef HAVE_SQLITE /* Define to 1 if you have the SQLite library. */ #undef HAVE_SQLITE3 -/* Define to the version of the SQLite library. */ -#undef HAVE_SQLITE3_VERSION - -/* Define to the version of the SQLite library. */ -#undef HAVE_SQLITE_VERSION - /* Define to 1 if you have the `sqrtl' function. */ #undef HAVE_SQRTL /* Define to 1 if you have the ISDN SS7 library. */ #undef HAVE_SS7 -/* Define to the version of the ISDN SS7 library. */ -#undef HAVE_SS7_VERSION - /* Define to 1 if `stat' has the bug that it succeeds when given the zero-length file name argument. */ #undef HAVE_STAT_EMPTY_STRING_BUG @@ -878,9 +695,6 @@ /* Define to 1 if you have the mISDN Supplemental Services library. */ #undef HAVE_SUPPSERV -/* Define to the version of the mISDN Supplemental Services library. */ -#undef HAVE_SUPPSERV_VERSION - /* Define to 1 if you have the `swapctl' function. */ #undef HAVE_SWAPCTL @@ -950,33 +764,21 @@ /* Define to 1 if you have the Termcap library. */ #undef HAVE_TERMCAP -/* Define to the version of the Termcap library. */ -#undef HAVE_TERMCAP_VERSION - /* Define to 1 if you have the <termios.h> header file. */ #undef HAVE_TERMIOS_H /* Define if your system has the TIMERFD headers. */ #undef HAVE_TIMERFD -/* Define TIMERFD headers version */ -#undef HAVE_TIMERFD_VERSION - /* Define to 1 if your system defines timersub. */ #undef HAVE_TIMERSUB /* Define to 1 if you have the Term Info library. */ #undef HAVE_TINFO -/* Define to the version of the Term Info library. */ -#undef HAVE_TINFO_VERSION - /* Define to 1 if you have the tonezone library. */ #undef HAVE_TONEZONE -/* Define to the version of the tonezone library. */ -#undef HAVE_TONEZONE_VERSION - /* Define to 1 if you have the `trunc' function. */ #undef HAVE_TRUNC @@ -989,18 +791,12 @@ /* Define to 1 if you have the unixODBC library. */ #undef HAVE_UNIXODBC -/* Define to the version of the unixODBC library. */ -#undef HAVE_UNIXODBC_VERSION - /* Define to 1 if you have the `unsetenv' function. */ #undef HAVE_UNSETENV /* Define to 1 if you have the usb library. */ #undef HAVE_USB -/* Define to the version of the usb library. */ -#undef HAVE_USB_VERSION - /* Define to 1 if you have the `utime' function. */ #undef HAVE_UTIME @@ -1025,15 +821,9 @@ /* Define to 1 if you have the Vorbis library. */ #undef HAVE_VORBIS -/* Define to the version of the Vorbis library. */ -#undef HAVE_VORBIS_VERSION - /* Define if your system has the VoiceTronix API libraries. */ #undef HAVE_VPB -/* Define to the version of the Voicetronix API library. */ -#undef HAVE_VPB_VERSION - /* Define to 1 if you have the `vprintf' function. */ #undef HAVE_VPRINTF @@ -1058,9 +848,6 @@ /* Define to 1 if you have the zlib compression library. */ #undef HAVE_ZLIB -/* Define to the version of the zlib compression library. */ -#undef HAVE_ZLIB_VERSION - /* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL |