Make the --without-oss argument work. (issue #9026 reported by puzzled)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@54026 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index 7da38807e44b56c48dee789cef1b010601a388d7..1f44aacd03e12723a1029d7a9102984589b87c14 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 53715 .
+# From configure.ac Revision: 53850 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -22468,6 +22468,7 @@ echo "$as_me: *** without explicitly specifying --with-${OSPTK_OPTION}" >&6;}
 fi
 
 
+if test "${USE_OSS}" != "no"; then
 PBX_OSS=0
 if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5
@@ -23144,6 +23145,7 @@ echo "$as_me: *** without explicitly specifying --with-${OSS_OPTION}" >&6;}
    fi
 fi
 
+fi
 fi
 
 PG_CONFIG=No

diff --git a/configure.ac b/configure.ac
index 298ad18a4a186a153832adabf8f68fa7417b788e..5dabca9d337dce0cca93c6f2839a1f75b20d9137 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -698,6 +698,7 @@ AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], [])
 
 AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl])
 
+if test "${USE_OSS}" != "no"; then
 PBX_OSS=0
 AC_CHECK_HEADER([linux/soundcard.h],
                [
@@ -714,6 +715,7 @@ fi
 if test "$PBX_OSS" = "0"; then
    AST_EXT_LIB_CHECK([OSS], [ossaudio], [oss_ioctl_mixer], [soundcard.h])
 fi
+fi
 
 PG_CONFIG=No
 if test "${USE_PGSQL}" != "no"; then