[svn-commits] file: branch 1.4 r54026 - in /branches/1.4: configure configure.ac

[svn-commits at lists.digium.com]

Author: file
Date: Mon Feb 12 10:34:45 2007
New Revision: 54026

URL: http://svn.digium.com/view/asterisk?view=rev&rev=54026
Log:
Make the --without-oss argument work. (issue #9026 reported by puzzled)

Modified:
    branches/1.4/configure
    branches/1.4/configure.ac

Modified: branches/1.4/configure
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure?view=diff&rev=54026&r1=54025&r2=54026
==============================================================================
--- branches/1.4/configure (original)
+++ branches/1.4/configure Mon Feb 12 10:34:45 2007
@@ -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 @@
 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 @@
    fi
 fi
 
+fi
 fi
 
 PG_CONFIG=No

Modified: branches/1.4/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure.ac?view=diff&rev=54026&r1=54025&r2=54026
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Mon Feb 12 10:34:45 2007
@@ -698,6 +698,7 @@
 
 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],
 	        [
@@ -713,6 +714,7 @@
 fi
 if test "$PBX_OSS" = "0"; then
    AST_EXT_LIB_CHECK([OSS], [ossaudio], [oss_ioctl_mixer], [soundcard.h])
+fi
 fi
 
 PG_CONFIG=No