diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-12 16:34:45 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-12 16:34:45 +0000 |
| commit | c02a5a74a07232221886f87a8cfef5aa45e8154d (patch) | |
| tree | 42061c97855c11e567b18f612880c0c3392b6e85 | |
| parent | de61eaa75dbeceeeb3d5c6d9ada0c53fec36a387 (diff) | |
Make the --without-oss argument work. (issue #9026 reported by puzzled)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@54026 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -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 @@ -23145,6 +23146,7 @@ echo "$as_me: *** without explicitly specifying --with-${OSS_OPTION}" >&6;} fi fi +fi PG_CONFIG=No if test "${USE_PGSQL}" != "no"; then diff --git a/configure.ac b/configure.ac index 298ad18a4..5dabca9d3 100644 --- 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 |