diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-09 02:17:10 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-09 02:17:10 +0000 |
| commit | a5ee187b26c102129009bf0848c7f7d3cbda5198 (patch) | |
| tree | 1769a8e39416a47e3f4e510ba590e71e342ede41 /configure | |
| parent | e6f5903baaeae76aa607147bbcfcdef3a7a33fbf (diff) | |
Merged revisions 262102 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r262102 | tilghman | 2010-05-08 21:14:04 -0500 (Sat, 08 May 2010) | 5 lines
Cleanup a bit more by getting rid of useless version defines. Also make library detection use passed CFLAGS.
(closes issue #17309)
Reported by: stuarth
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@262104 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 696 |
1 files changed, 380 insertions, 316 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 261915 . +# From configure.ac Revision: 262050 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -8153,8 +8153,6 @@ fi - - # BKTR is used for backtrace support on platforms that do not # have it natively. @@ -8188,8 +8186,6 @@ fi - - CAP_DESCRIP="POSIX 1.e capabilities" CAP_OPTION="cap" @@ -8220,8 +8216,6 @@ fi - - CURL_DESCRIP="cURL" CURL_OPTION="curl" @@ -8252,8 +8246,6 @@ fi - - CURSES_DESCRIP="curses" CURSES_OPTION="curses" @@ -8284,8 +8276,6 @@ fi - - CRYPTO_DESCRIP="OpenSSL Cryptography" CRYPTO_OPTION="crypto" @@ -8316,8 +8306,6 @@ fi - - DAHDI_DESCRIP="DAHDI" DAHDI_OPTION="dahdi" @@ -8348,8 +8336,6 @@ fi - - FFMPEG_DESCRIP="Ffmpeg and avcodec" FFMPEG_OPTION="avcodec" @@ -8380,8 +8366,6 @@ fi - - GSM_DESCRIP="External GSM" GSM_OPTION="gsm" @@ -8412,8 +8396,6 @@ fi - - GTK_DESCRIP="gtk" GTK_OPTION="gtk" @@ -8444,8 +8426,6 @@ fi - - GTK2_DESCRIP="gtk2" GTK2_OPTION="gtk2" @@ -8476,8 +8456,6 @@ fi - - GMIME_DESCRIP="GMime" GMIME_OPTION="gmime" @@ -8508,8 +8486,6 @@ fi - - HOARD_DESCRIP="Hoard Memory Allocator" HOARD_OPTION="hoard" @@ -8540,8 +8516,6 @@ fi - - ICONV_DESCRIP="Iconv" ICONV_OPTION="iconv" @@ -8572,8 +8546,6 @@ fi - - IKSEMEL_DESCRIP="Iksemel Jabber" IKSEMEL_OPTION="iksemel" @@ -8604,8 +8576,6 @@ fi - - IMAP_TK_DESCRIP="UW IMAP Toolkit" IMAP_TK_OPTION="imap" @@ -8636,8 +8606,6 @@ fi - - ISDNNET_DESCRIP="ISDN4Linux" ISDNNET_OPTION="isdnnet" @@ -8668,8 +8636,6 @@ fi - - JACK_DESCRIP="Jack Audio Connection Kit" JACK_OPTION="jack" @@ -8700,8 +8666,6 @@ fi - - LDAP_DESCRIP="OpenLDAP" LDAP_OPTION="ldap" @@ -8732,8 +8696,6 @@ fi - - LTDL_DESCRIP="libtool" LTDL_OPTION="ltdl" @@ -8764,8 +8726,6 @@ fi - - LUA_DESCRIP="Lua" LUA_OPTION="lua" @@ -8796,8 +8756,6 @@ fi - - MISDN_DESCRIP="mISDN user" MISDN_OPTION="misdn" @@ -8828,8 +8786,6 @@ fi - - NBS_DESCRIP="Network Broadcast Sound" NBS_OPTION="nbs" @@ -8860,8 +8816,6 @@ fi - - NCURSES_DESCRIP="ncurses" NCURSES_OPTION="ncurses" @@ -8892,8 +8846,6 @@ fi - - NETSNMP_DESCRIP="Net-SNMP" NETSNMP_OPTION="netsnmp" @@ -8924,8 +8876,6 @@ fi - - NEWT_DESCRIP="newt" NEWT_OPTION="newt" @@ -8956,8 +8906,6 @@ fi - - UNIXODBC_DESCRIP="unixODBC" UNIXODBC_OPTION="odbc" @@ -8988,8 +8936,6 @@ fi - - OGG_DESCRIP="OGG" OGG_OPTION="ogg" @@ -9020,8 +8966,6 @@ fi - - OSPTK_DESCRIP="OSP Toolkit" OSPTK_OPTION="osptk" @@ -9052,8 +8996,6 @@ fi - - OSS_DESCRIP="Open Sound System" OSS_OPTION="oss" @@ -9084,8 +9026,6 @@ fi - - PGSQL_DESCRIP="PostgreSQL" PGSQL_OPTION="postgres" @@ -9116,8 +9056,6 @@ fi - - POPT_DESCRIP="popt" POPT_OPTION="popt" @@ -9148,8 +9086,6 @@ fi - - PORTAUDIO_DESCRIP="PortAudio" PORTAUDIO_OPTION="portaudio" @@ -9180,8 +9116,6 @@ fi - - PRI_DESCRIP="ISDN PRI" PRI_OPTION="pri" @@ -9212,8 +9146,6 @@ fi - - PRI_INBANDDISCONNECT_DESCRIP="ISDN PRI set_inbanddisconnect" PRI_INBANDDISCONNECT_OPTION=pri @@ -9263,8 +9195,6 @@ fi - - SPANDSP_DESCRIP="SPANDSP" SPANDSP_OPTION="spandsp" @@ -9295,8 +9225,6 @@ fi - - SS7_DESCRIP="ISDN SS7" SS7_OPTION="ss7" @@ -9327,8 +9255,6 @@ fi - - PWLIB_DESCRIP="PWlib" PWLIB_OPTION="pwlib" @@ -9359,8 +9285,6 @@ fi - - OPENH323_DESCRIP="OpenH323" OPENH323_OPTION="h323" @@ -9391,8 +9315,6 @@ fi - - RADIUS_DESCRIP="Radius Client" RADIUS_OPTION="radius" @@ -9423,8 +9345,6 @@ fi - - SDL_DESCRIP="Sdl" SDL_OPTION="sdl" @@ -9455,8 +9375,6 @@ fi - - SDL_IMAGE_DESCRIP="Sdl Image" SDL_IMAGE_OPTION="SDL_image" @@ -9487,8 +9405,6 @@ fi - - OPENAIS_DESCRIP="OpenAIS" OPENAIS_OPTION="openais" @@ -9519,8 +9435,6 @@ fi - - SPEEX_DESCRIP="Speex" SPEEX_OPTION="speex" @@ -9551,8 +9465,6 @@ fi - - SPEEX_PREPROCESS_DESCRIP="Speex preprocess routines" SPEEX_PREPROCESS_OPTION="speex" @@ -9583,8 +9495,6 @@ fi - - SPEEXDSP_DESCRIP="SpeexDSP" SPEEXDSP_OPTION="speexdsp" @@ -9615,8 +9525,6 @@ fi - - SPEEX_PREPROCESS_DESCRIP="speex_preprocess_ctl" SPEEX_PREPROCESS_OPTION=speex @@ -9659,8 +9567,6 @@ fi - - SQLITE3_DESCRIP="SQLite" SQLITE3_OPTION="sqlite3" @@ -9691,8 +9597,6 @@ fi - - SUPPSERV_DESCRIP="mISDN Supplemental Services" SUPPSERV_OPTION="suppserv" @@ -9723,8 +9627,6 @@ fi - - OPENSSL_DESCRIP="OpenSSL Secure Sockets Layer" OPENSSL_OPTION="ssl" @@ -9755,8 +9657,6 @@ fi - - FREETDS_DESCRIP="FreeTDS" FREETDS_OPTION="tds" @@ -9787,8 +9687,6 @@ fi - - TERMCAP_DESCRIP="Termcap" TERMCAP_OPTION="termcap" @@ -9819,8 +9717,6 @@ fi - - TINFO_DESCRIP="Term Info" TINFO_OPTION="tinfo" @@ -9851,8 +9747,6 @@ fi - - TONEZONE_DESCRIP="tonezone" TONEZONE_OPTION="tonezone" @@ -9883,8 +9777,6 @@ fi - - USB_DESCRIP="usb" USB_OPTION="usb" @@ -9915,8 +9807,6 @@ fi - - VORBIS_DESCRIP="Vorbis" VORBIS_OPTION="vorbis" @@ -9947,8 +9837,6 @@ fi - - VPB_DESCRIP="Voicetronix API" VPB_OPTION="vpb" @@ -9979,8 +9867,6 @@ fi - - X11_DESCRIP="X11" X11_OPTION="x11" @@ -10011,8 +9897,6 @@ fi - - ZLIB_DESCRIP="zlib compression" ZLIB_OPTION="z" @@ -10043,8 +9927,6 @@ fi - - # check for basic system features and functionality before # checking for package libraries @@ -17204,10 +17086,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 @@ -17524,10 +17402,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 @@ -19243,10 +19117,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_GLOB_NOMAGIC_VERSION -_ACEOF - else echo "$as_me: failed program was:" >&5 @@ -19320,10 +19190,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_GLOB_BRACE_VERSION -_ACEOF - else echo "$as_me: failed program was:" >&5 @@ -19397,10 +19263,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 @@ -19980,6 +19842,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; } @@ -20049,6 +19913,7 @@ else AST_ALSA_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -20062,7 +19927,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 @@ -20201,7 +20066,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${ALSA_HEADER_FOUND}" = "x0" ; then ALSA_LIB="" @@ -20213,14 +20078,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. @@ -20235,6 +20101,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; } @@ -20304,6 +20172,7 @@ else AST_CURSES_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -20317,7 +20186,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 @@ -20456,7 +20325,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${CURSES_HEADER_FOUND}" = "x0" ; then CURSES_LIB="" @@ -20468,13 +20337,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 @@ -20491,6 +20361,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; } @@ -20560,6 +20432,7 @@ else AST_CAP_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -20573,7 +20446,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 @@ -20712,7 +20585,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${CAP_HEADER_FOUND}" = "x0" ; then CAP_LIB="" @@ -20724,12 +20597,13 @@ fi PBX_CAP=1 cat >>confdefs.h <<_ACEOF #define HAVE_CAP 1 -#define HAVE_CAP_VERSION _ACEOF + fi fi fi + fi @@ -20789,10 +20663,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_DAHDI_VERSION -_ACEOF - else echo "$as_me: failed program was:" >&5 @@ -20866,10 +20736,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETIFADDRS_VERSION -_ACEOF - else echo "$as_me: failed program was:" >&5 @@ -21599,6 +21465,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; } @@ -21668,6 +21536,7 @@ else AST_ICONV_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -21681,7 +21550,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 @@ -21820,7 +21689,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${ICONV_HEADER_FOUND}" = "x0" ; then ICONV_LIB="" @@ -21832,12 +21701,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 @@ -21854,6 +21724,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; } @@ -21923,6 +21795,7 @@ else AST_ICONV_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -21936,7 +21809,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 @@ -22075,7 +21948,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${ICONV_HEADER_FOUND}" = "x0" ; then ICONV_LIB="" @@ -22087,14 +21960,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. @@ -22109,6 +21983,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; } @@ -22178,6 +22054,7 @@ else AST_IKSEMEL_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -22191,7 +22068,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 @@ -22330,7 +22207,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${IKSEMEL_HEADER_FOUND}" = "x0" ; then IKSEMEL_LIB="" @@ -22342,13 +22219,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}" @@ -23196,6 +23074,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; } @@ -23265,6 +23145,7 @@ else AST_JACK_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -23278,7 +23159,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 @@ -23417,7 +23298,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${JACK_HEADER_FOUND}" = "x0" ; then JACK_LIB="" @@ -23429,13 +23310,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 @@ -23452,6 +23334,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; } @@ -23521,6 +23405,7 @@ else AST_LTDL_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -23534,7 +23419,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 @@ -23673,7 +23558,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${LTDL_HEADER_FOUND}" = "x0" ; then LTDL_LIB="" @@ -23685,14 +23570,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. @@ -23707,6 +23593,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; } @@ -23776,6 +23664,7 @@ else AST_LDAP_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -23789,7 +23678,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 @@ -23928,7 +23817,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${LDAP_HEADER_FOUND}" = "x0" ; then LDAP_LIB="" @@ -23940,14 +23829,15 @@ fi PBX_LDAP=1 cat >>confdefs.h <<_ACEOF #define HAVE_LDAP 1 -#define HAVE_LDAP_VERSION _ACEOF + fi fi fi + if test "x${PBX_MISDN}" != "x1" -a "${USE_MISDN}" != "no"; then pbxlibdir="" # if --with-MISDN=DIR has been specified, use it. @@ -23962,6 +23852,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; } @@ -24031,6 +23923,7 @@ else AST_MISDN_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -24044,7 +23937,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 @@ -24183,7 +24076,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${MISDN_HEADER_FOUND}" = "x0" ; then MISDN_LIB="" @@ -24195,13 +24088,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 @@ -24218,6 +24112,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; } @@ -24287,6 +24183,7 @@ else AST_ISDNNET_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -24300,7 +24197,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 @@ -24439,7 +24336,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${ISDNNET_HEADER_FOUND}" = "x0" ; then ISDNNET_LIB="" @@ -24451,13 +24348,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. @@ -24472,6 +24370,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; } @@ -24541,6 +24441,7 @@ else AST_SUPPSERV_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -24554,7 +24455,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 @@ -24693,7 +24594,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SUPPSERV_HEADER_FOUND}" = "x0" ; then SUPPSERV_LIB="" @@ -24705,13 +24606,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; } @@ -24768,10 +24670,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 @@ -24844,10 +24742,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 @@ -25019,6 +24913,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; } @@ -25088,6 +24984,7 @@ else AST_NBS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -25101,7 +24998,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 @@ -25240,7 +25137,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${NBS_HEADER_FOUND}" = "x0" ; then NBS_LIB="" @@ -25252,14 +25149,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. @@ -25274,6 +25172,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; } @@ -25343,6 +25243,7 @@ else AST_NCURSES_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -25356,7 +25257,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 @@ -25495,7 +25396,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${NCURSES_HEADER_FOUND}" = "x0" ; then NCURSES_LIB="" @@ -25507,14 +25408,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 @@ -25712,6 +25614,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; } @@ -25781,6 +25685,7 @@ else AST_NEWT_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -25794,7 +25699,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 @@ -25933,7 +25838,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${NEWT_HEADER_FOUND}" = "x0" ; then NEWT_LIB="" @@ -25945,14 +25850,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. @@ -25967,6 +25873,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; } @@ -26036,6 +25944,7 @@ else AST_UNIXODBC_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -26049,7 +25958,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 @@ -26188,7 +26097,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${UNIXODBC_HEADER_FOUND}" = "x0" ; then UNIXODBC_LIB="" @@ -26200,14 +26109,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. @@ -26222,6 +26132,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; } @@ -26291,6 +26203,7 @@ else AST_OGG_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -26304,7 +26217,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 @@ -26443,7 +26356,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${OGG_HEADER_FOUND}" = "x0" ; then OGG_LIB="" @@ -26455,13 +26368,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 @@ -26478,6 +26392,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; } @@ -26547,6 +26463,7 @@ else AST_BKTR_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -26560,7 +26477,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 @@ -26699,7 +26616,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${BKTR_HEADER_FOUND}" = "x0" ; then BKTR_LIB="" @@ -26711,12 +26628,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 @@ -26733,6 +26651,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; } @@ -26802,6 +26722,7 @@ else AST_BKTR_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -26815,7 +26736,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 @@ -26954,7 +26875,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${BKTR_HEADER_FOUND}" = "x0" ; then BKTR_LIB="" @@ -26966,13 +26887,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 @@ -26989,6 +26911,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; } @@ -27058,6 +26982,7 @@ else AST_OSS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -27071,7 +26996,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 @@ -27210,7 +27135,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${OSS_HEADER_FOUND}" = "x0" ; then OSS_LIB="" @@ -27222,13 +27147,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. @@ -27243,6 +27169,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; } @@ -27312,6 +27240,7 @@ else AST_OSS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -27325,7 +27254,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 @@ -27464,7 +27393,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${OSS_HEADER_FOUND}" = "x0" ; then OSS_LIB="" @@ -27476,13 +27405,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. @@ -27497,6 +27427,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; } @@ -27566,6 +27498,7 @@ else AST_OSS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -27579,7 +27512,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 @@ -27718,7 +27651,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${OSS_HEADER_FOUND}" = "x0" ; then OSS_LIB="" @@ -27730,13 +27663,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 @@ -28080,6 +28014,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; } @@ -28149,6 +28085,7 @@ else AST_POPT_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -28162,7 +28099,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 @@ -28301,7 +28238,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${POPT_HEADER_FOUND}" = "x0" ; then POPT_LIB="" @@ -28313,14 +28250,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. @@ -28335,6 +28273,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; } @@ -28404,6 +28344,7 @@ else AST_PORTAUDIO_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -28417,7 +28358,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 @@ -28556,7 +28497,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${PORTAUDIO_HEADER_FOUND}" = "x0" ; then PORTAUDIO_LIB="" @@ -28568,14 +28509,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. @@ -28590,6 +28532,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; } @@ -28659,6 +28603,7 @@ else AST_PRI_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -28672,7 +28617,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 @@ -28811,7 +28756,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${PRI_HEADER_FOUND}" = "x0" ; then PRI_LIB="" @@ -28823,14 +28768,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_INBANDDISCONNECT}" != "x1" -a "${USE_PRI_INBANDDISCONNECT}" != "no"; then pbxlibdir="" # if --with-PRI_INBANDDISCONNECT=DIR has been specified, use it. @@ -28845,6 +28791,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; } @@ -28914,6 +28862,7 @@ else AST_PRI_INBANDDISCONNECT_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -28927,7 +28876,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 @@ -29066,7 +29015,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="" @@ -29078,14 +29027,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. @@ -29100,6 +29050,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; } @@ -29169,6 +29121,7 @@ else AST_RESAMPLE_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -29182,7 +29135,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 @@ -29321,7 +29274,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${RESAMPLE_HEADER_FOUND}" = "x0" ; then RESAMPLE_LIB="" @@ -29333,14 +29286,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 @@ -29409,10 +29363,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_SPANDSP_VERSION -_ACEOF - else echo "$as_me: failed program was:" >&5 @@ -29447,6 +29397,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; } @@ -29516,6 +29468,7 @@ else AST_SPANDSP_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -29529,7 +29482,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 @@ -29668,7 +29621,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SPANDSP_HEADER_FOUND}" = "x0" ; then SPANDSP_LIB="" @@ -29680,12 +29633,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 @@ -29706,6 +29660,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; } @@ -29775,6 +29731,7 @@ else AST_SPANDSP_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -29788,7 +29745,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 @@ -29927,7 +29884,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SPANDSP_HEADER_FOUND}" = "x0" ; then SPANDSP_LIB="" @@ -29939,12 +29896,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 @@ -30018,6 +29976,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; } @@ -30087,6 +30047,7 @@ else AST_SS7_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -30100,7 +30061,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 @@ -30239,7 +30200,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SS7_HEADER_FOUND}" = "x0" ; then SS7_LIB="" @@ -30251,13 +30212,14 @@ fi PBX_SS7=1 cat >>confdefs.h <<_ACEOF #define HAVE_SS7 1 -#define HAVE_SS7_VERSION _ACEOF + fi fi fi + if test "${USE_PWLIB}" != "no"; then if test -n "${PWLIB_DIR}"; then PWLIBDIR="${PWLIB_DIR}" @@ -32128,6 +32090,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; } @@ -32197,6 +32161,7 @@ else AST_LUA_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -32210,7 +32175,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 @@ -32349,7 +32314,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${LUA_HEADER_FOUND}" = "x0" ; then LUA_LIB="" @@ -32361,12 +32326,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 @@ -32391,6 +32357,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; } @@ -32460,6 +32428,7 @@ else AST_LUA_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -32473,7 +32442,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 @@ -32612,7 +32581,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${LUA_HEADER_FOUND}" = "x0" ; then LUA_LIB="" @@ -32624,14 +32593,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. @@ -32646,6 +32616,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; } @@ -32715,6 +32687,7 @@ else AST_RADIUS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -32728,7 +32701,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 @@ -32867,7 +32840,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then RADIUS_LIB="" @@ -32879,13 +32852,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 @@ -32910,6 +32884,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; } @@ -32979,6 +32955,7 @@ else AST_OPENAIS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -32992,7 +32969,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 @@ -33131,7 +33108,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${OPENAIS_HEADER_FOUND}" = "x0" ; then OPENAIS_LIB="" @@ -33143,13 +33120,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 @@ -33180,6 +33158,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; } @@ -33249,6 +33229,7 @@ else AST_SPEEX_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -33262,7 +33243,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 @@ -33401,7 +33382,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SPEEX_HEADER_FOUND}" = "x0" ; then SPEEX_LIB="" @@ -33413,13 +33394,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 @@ -33436,6 +33418,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; } @@ -33505,6 +33489,7 @@ else AST_SPEEX_PREPROCESS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -33518,7 +33503,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 @@ -33657,7 +33642,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="" @@ -33669,12 +33654,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 @@ -33694,6 +33680,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; } @@ -33763,6 +33751,7 @@ else AST_SPEEXDSP_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -33776,7 +33765,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 @@ -33915,7 +33904,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SPEEXDSP_HEADER_FOUND}" = "x0" ; then SPEEXDSP_LIB="" @@ -33927,12 +33916,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 @@ -33954,6 +33944,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; } @@ -34023,6 +34015,7 @@ else AST_SQLITE_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -34036,7 +34029,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 @@ -34175,7 +34168,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SQLITE_HEADER_FOUND}" = "x0" ; then SQLITE_LIB="" @@ -34187,14 +34180,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. @@ -34209,6 +34203,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; } @@ -34278,6 +34274,7 @@ else AST_SQLITE3_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -34291,7 +34288,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 @@ -34430,7 +34427,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${SQLITE3_HEADER_FOUND}" = "x0" ; then SQLITE3_LIB="" @@ -34442,14 +34439,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. @@ -34464,6 +34462,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; } @@ -34533,6 +34533,7 @@ else AST_CRYPTO_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -34546,7 +34547,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 @@ -34685,7 +34686,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${CRYPTO_HEADER_FOUND}" = "x0" ; then CRYPTO_LIB="" @@ -34697,13 +34698,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 @@ -34721,6 +34723,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; } @@ -34790,6 +34794,7 @@ else AST_OPENSSL_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -34803,7 +34808,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 @@ -34942,7 +34947,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${OPENSSL_HEADER_FOUND}" = "x0" ; then OPENSSL_LIB="" @@ -34954,12 +34959,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"; @@ -35470,6 +35476,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; } @@ -35539,6 +35547,7 @@ else AST_HOARD_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -35552,7 +35561,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 @@ -35691,7 +35700,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${HOARD_HEADER_FOUND}" = "x0" ; then HOARD_LIB="" @@ -35703,14 +35712,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. @@ -35725,6 +35735,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; } @@ -35794,6 +35806,7 @@ else AST_FREETDS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -35807,7 +35820,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 @@ -35946,7 +35959,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${FREETDS_HEADER_FOUND}" = "x0" ; then FREETDS_LIB="" @@ -35958,14 +35971,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. @@ -35980,6 +35994,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; } @@ -36049,6 +36065,7 @@ else AST_TERMCAP_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -36062,7 +36079,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 @@ -36201,7 +36218,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${TERMCAP_HEADER_FOUND}" = "x0" ; then TERMCAP_LIB="" @@ -36213,14 +36230,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. @@ -36235,6 +36253,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; } @@ -36304,6 +36324,7 @@ else AST_TINFO_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -36317,7 +36338,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 @@ -36456,7 +36477,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${TINFO_HEADER_FOUND}" = "x0" ; then TINFO_LIB="" @@ -36468,13 +36489,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 @@ -36562,6 +36584,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; } @@ -36631,6 +36655,7 @@ else AST_TONEZONE_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -36644,7 +36669,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 @@ -36783,7 +36808,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${TONEZONE_HEADER_FOUND}" = "x0" ; then TONEZONE_LIB="" @@ -36795,14 +36820,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. @@ -36817,6 +36843,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; } @@ -36886,6 +36914,7 @@ else AST_USB_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -36899,7 +36928,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 @@ -37038,7 +37067,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${USB_HEADER_FOUND}" = "x0" ; then USB_LIB="" @@ -37050,14 +37079,15 @@ fi PBX_USB=1 cat >>confdefs.h <<_ACEOF #define HAVE_USB 1 -#define HAVE_USB_VERSION _ACEOF + fi fi fi + if test "x${PBX_VORBIS}" != "x1" -a "${USE_VORBIS}" != "no"; then pbxlibdir="" # if --with-VORBIS=DIR has been specified, use it. @@ -37072,6 +37102,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; } @@ -37141,6 +37173,7 @@ else AST_VORBIS_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -37154,7 +37187,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 @@ -37293,7 +37326,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${VORBIS_HEADER_FOUND}" = "x0" ; then VORBIS_LIB="" @@ -37305,13 +37338,14 @@ fi PBX_VORBIS=1 cat >>confdefs.h <<_ACEOF #define HAVE_VORBIS 1 -#define HAVE_VORBIS_VERSION _ACEOF + fi fi fi + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -37426,6 +37460,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; } @@ -37495,6 +37531,7 @@ else AST_ZLIB_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -37508,7 +37545,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 @@ -37647,7 +37684,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${ZLIB_HEADER_FOUND}" = "x0" ; then ZLIB_LIB="" @@ -37659,13 +37696,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" @@ -38270,6 +38308,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; } @@ -38339,6 +38379,7 @@ else AST_SDL_IMAGE_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -38352,7 +38393,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 @@ -38491,7 +38532,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="" @@ -38503,13 +38544,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. @@ -38524,6 +38566,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; } @@ -38593,6 +38637,7 @@ else AST_FFMPEG_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -38606,7 +38651,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 @@ -38745,7 +38790,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${FFMPEG_HEADER_FOUND}" = "x0" ; then FFMPEG_LIB="" @@ -38757,13 +38802,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 @@ -38921,6 +38967,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; } @@ -38990,6 +39038,7 @@ else AST_X11_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -39003,7 +39052,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 @@ -39142,7 +39191,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${X11_HEADER_FOUND}" = "x0" ; then X11_LIB="" @@ -39154,13 +39203,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. @@ -39175,6 +39230,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; } @@ -39244,6 +39301,7 @@ else AST_X11_FOUND=no fi + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" fi # now check for the header. @@ -39257,7 +39315,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 @@ -39396,7 +39454,7 @@ else fi - CPPFLAGS="${saved_cppflags}" + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" fi if test "x${X11_HEADER_FOUND}" = "x0" ; then X11_LIB="" @@ -39408,13 +39466,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 |