[svn-commits] branch group/autoconf_and_menuselect r22127 - /team/group/autoconf_and_menuse...

[svn-commits at lists.digium.com]

Author: russell
Date: Sat Apr 22 01:39:15 2006
New Revision: 22127

URL: http://svn.digium.com/view/asterisk?rev=22127&view=rev
Log:
convert the rest of the uses of AST_EXT_LIB to include header checks

Modified:
    team/group/autoconf_and_menuselect/configure.ac

Modified: team/group/autoconf_and_menuselect/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/configure.ac?rev=22127&r1=22126&r2=22127&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/configure.ac (original)
+++ team/group/autoconf_and_menuselect/configure.ac Sat Apr 22 01:39:15 2006
@@ -157,26 +157,29 @@
 	      *) AC_MSG_ERROR(bad value ${enableval} for --enable-developer-mode)  ;;
 	esac])
 
-##################
-# These still need headers added to them!
-AST_EXT_LIB([ogg], [ogg_sync_init], [], [OGG], [OGG])
-AST_EXT_LIB([vorbis], [vorbis_info_init], [], [VORBIS], [Vorbis], [-lm -lvorbisenc])
-AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [], [OSS], [Open Sound System])
-AST_EXT_LIB([speex], [speex_encode], [], [SPEEX], [Speex], [-lm])
-AST_EXT_LIB([sqlite], [sqlite_exec], [], [SQLITE], [SQLite])
-AST_EXT_LIB([tds], [tds_version], [], [FREETDS], [FreeTDS])
-AST_EXT_LIB([ssl], [ssl2_connect], [], [OPENSSL], [OpenSSL], [-lcrypto])
-##################
-
 AST_EXT_LIB([asound], [snd_spcm_init], [alsa/asoundlib.h], [ALSA], [Advanced Linux Sound Architecture], [-lm -ldl])
 AST_EXT_LIB([mfcr2], [mfcr2_MakeCall], [libmfcr2.h], [MFCR2], [MFCR2])
 AST_EXT_LIB([nbs], [nbs_setup], [nbs.h], [NBS], [Network Broadcast Sound])
 AST_EXT_LIB([newt], [newtBell], [newt.h], [NEWT], [newt])
 AST_EXT_LIB([odbc], [SQLConnect], [sql.h], [UNIXODBC], [unixODBC])
+AST_EXT_LIB([ogg], [ogg_sync_init], [], [OGG], [OGG])
 AST_EXT_LIB([osptk], [OSPPCryptoDecrypt], [osp/osp.h], [OSPTK], [OSP Toolkit], [-lcrypto -lssl])
 AST_EXT_LIB([popt], [poptStrerror], [popt.h], [POPT], [popt])
 AST_EXT_LIB([pri], [pri_call], [libpri.h], [LIBPRI], [ISDN PRI])
+AST_EXT_LIB([speex], [speex_encode], [speex/speex.h], [SPEEX], [Speex], [-lm])
+AST_EXT_LIB([sqlite], [sqlite_exec], [sqlite.h], [SQLITE], [SQLite])
+AST_EXT_LIB([ssl], [ssl2_connect], [openssl/ssl.h], [OPENSSL], [OpenSSL], [-lcrypto])
+AST_EXT_LIB([tds], [tds_version], [tds.h], [FREETDS], [FreeTDS])
+AST_EXT_LIB([vorbis], [vorbis_info_init], [vorbis/codec.h], [VORBIS], [Vorbis], [-lm -lvorbisenc])
 AST_EXT_LIB([z], [compress], [zlib.h], [ZLIB], [zlib])
+
+if test "x${PBX_OSTYPE}" = "xLinux" ; then
+   AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [linux/soundcard.h], [OSS], [Open Sound System])
+elif test "x${PBX_OSTYPE}" = "xFreeBSD" ; then
+   AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [sys/soundcard.h], [OSS], [Open Sound System])
+else
+   AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [soundcard.h], [OSS], [Open Sound System])
+fi
 
 if test "x${PBX_OSTYPE}" = "xLinux" ; then
    AST_EXT_LIB([tonezone], [tone_zone_find], [linux/zaptel.h], [ZAPTEL], [Zaptel])