diff --git a/configure b/configure index 6f370de40fa6c225b9b03eb44a51d0bb870b5599..bccfe9dc1a76787d1a9ee0b44d3f848fc90935a4 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 37027 . +# From configure.ac Revision: 37066 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59e. # @@ -790,7 +790,6 @@ POW_LIB KDEINIT KDEDIR NETSNMP_CONFIG -PBX_LIBOSS PG_CONFIG QTMOC EDITLINE_LIB @@ -19690,7 +19689,7 @@ _ACEOF fi -PBX_LIBOSS=0 +PBX_OSS=0 if test "${ac_cv_header_linux_soundcard_h+set}" = set; then { echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5 echo $ECHO_N "checking for linux/soundcard.h... $ECHO_C" >&6; } @@ -19842,7 +19841,7 @@ echo "${ECHO_T}$ac_cv_header_linux_soundcard_h" >&6; } fi if test $ac_cv_header_linux_soundcard_h = yes; then - PBX_LIBOSS=1 + PBX_OSS=1 cat >>confdefs.h <<_ACEOF #define HAVE_OSS 1 @@ -19852,7 +19851,7 @@ _ACEOF fi -if test "$PBX_LIBOSS" = "0"; then +if test "$PBX_OSS" = "0"; then if test "${ac_cv_header_sys_soundcard_h+set}" = set; then { echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6; } @@ -20004,7 +20003,7 @@ echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6; } fi if test $ac_cv_header_sys_soundcard_h = yes; then - PBX_LIBossaudio=1 + PBX_OSS=1 cat >>confdefs.h <<_ACEOF #define HAVE_OSS 1 @@ -20015,7 +20014,7 @@ fi fi -if test "$PBX_LIBOSS" = "0"; then +if test "$PBX_OSS" = "0"; then if test "${USE_OSS}" != "no"; then pbxlibdir="" @@ -20469,7 +20468,6 @@ fi fi - PG_CONFIG=No if test "${USE_PGSQL}" != "no"; then if test "x${PGSQL_DIR}" != "x"; then @@ -28160,12 +28158,12 @@ POW_LIB!$POW_LIB$ac_delim KDEINIT!$KDEINIT$ac_delim KDEDIR!$KDEDIR$ac_delim NETSNMP_CONFIG!$NETSNMP_CONFIG$ac_delim -PBX_LIBOSS!$PBX_LIBOSS$ac_delim PG_CONFIG!$PG_CONFIG$ac_delim QTMOC!$QTMOC$ac_delim EDITLINE_LIB!$EDITLINE_LIB$ac_delim PBX_H323!$PBX_H323$ac_delim PBX_IXJUSER!$PBX_IXJUSER$ac_delim +GTKCONFIG!$GTKCONFIG$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -28207,7 +28205,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -GTKCONFIG!$GTKCONFIG$ac_delim PBX_GTK!$PBX_GTK$ac_delim GTK_INCLUDE!$GTK_INCLUDE$ac_delim GTK_LIB!$GTK_LIB$ac_delim @@ -28217,7 +28214,7 @@ CURLLIB!$CURLLIB$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 2097a3a1c129b49b8582ffb5a94dae0016799e70..acdc551879443b5731b20fc371a64132fa01c331 100644 --- a/configure.ac +++ b/configure.ac @@ -445,23 +445,22 @@ AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], []) AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl]) -PBX_LIBOSS=0 +PBX_OSS=0 AC_CHECK_HEADER([linux/soundcard.h], [ - PBX_LIBOSS=1 + PBX_OSS=1 AC_DEFINE_UNQUOTED([HAVE_OSS], 1, [Define to indicate the Open Sound System library]) ]) -if test "$PBX_LIBOSS" = "0"; then +if test "$PBX_OSS" = "0"; then AC_CHECK_HEADER([sys/soundcard.h], [ - PBX_LIBossaudio=1 + PBX_OSS=1 AC_DEFINE_UNQUOTED([HAVE_OSS], 1, [Define to indicate the Open Sound System library]) ]) fi -if test "$PBX_LIBOSS" = "0"; then +if test "$PBX_OSS" = "0"; then AST_EXT_LIB_CHECK([OSS], [ossaudio], [oss_ioctl_mixer], [soundcard.h]) fi -AC_SUBST([PBX_LIBOSS]) PG_CONFIG=No if test "${USE_PGSQL}" != "no"; then