kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

use proper method of detecting OSS support on Linux and FreeBSD

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23736 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-04-30 17:49:50 +00:00
parent 70a2a3eaba
commit 0adfa8c635
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
channels/Makefile
View File

@@ -103,15 +103,10 @@ ringtone.h: gentone
./gentone ringtone 440 480 ./gentone ringtone 440 480
chan_oss.o: chan_oss.c busy.h ringtone.h chan_oss.o: chan_oss.c busy.h ringtone.h
$(CC) -c -o $@ $(CFLAGS) $(OSSAUDIO_INCLUDE) $<
ifeq ($(OSARCH),OpenBSD)
chan_oss.so: chan_oss.o chan_oss.so: chan_oss.o
$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio $(CC) $(SOLINK) -o $@ chan_oss.o $(OSSAUDIO_LIB)
endif
ifeq ($(OSARCH),NetBSD)
chan_oss.so: chan_oss.o
$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
endif
chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o
$(CC) $(SOLINK) -o $@ $< iax2-parser.o iax2-provision.o $(CC) $(SOLINK) -o $@ $< iax2-parser.o iax2-provision.o

2
channels/chan_oss.c
View File

@@ -33,7 +33,7 @@
*/ */
/*** MODULEINFO /*** MODULEINFO
<depend>osssound</depend> <depend>ossaudio</depend>
***/ ***/
#include <stdio.h> #include <stdio.h>

17
configure.ac
View File

@@ -174,14 +174,25 @@ 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([vorbis], [vorbis_info_init], [vorbis/codec.h], [VORBIS], [Vorbis], [-lm -lvorbisenc])
AST_EXT_LIB([z], [compress], [zlib.h], [ZLIB], [zlib]) AST_EXT_LIB([z], [compress], [zlib.h], [ZLIB], [zlib])
PBX_LIBossaudio=0
if test "x${PBX_OSTYPE}" = "xLinux" ; then if test "x${PBX_OSTYPE}" = "xLinux" ; then
AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [linux/soundcard.h], [OSS], [Open Sound System]) AC_CHECK_HEADER([linux/soundcard.h],
[PBX_LIBossaudio=1
AC_DEFINE_UNQUOTED([HAVE_OSS], 1, [Define to indicate the Open Sound System library])
])
elif test "x${PBX_OSTYPE}" = "xFreeBSD" ; then elif test "x${PBX_OSTYPE}" = "xFreeBSD" ; then
AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [sys/soundcard.h], [OSS], [Open Sound System]) AC_CHECK_HEADER([sys/soundcard.h],
else [PBX_LIBossaudio=1
AC_DEFINE_UNQUOTED([HAVE_OSS], 1, [Define to indicate the Open Sound System library])
])
elif test "x${PBX_OSTYPE}" = "xOpenBSD" ; then
AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [soundcard.h], [OSS], [Open Sound System])
elif test "x${PBX_OSTYPE}" = "xNetBSD" ; then
AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [soundcard.h], [OSS], [Open Sound System]) AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [soundcard.h], [OSS], [Open Sound System])
fi fi
AC_SUBST([PBX_LIBossaudio])
if test "x${PBX_OSTYPE}" = "xLinux" ; then if test "x${PBX_OSTYPE}" = "xLinux" ; then
AST_EXT_LIB([tonezone], [tone_zone_find], [linux/zaptel.h], [ZAPTEL], [Zaptel]) AST_EXT_LIB([tonezone], [tone_zone_find], [linux/zaptel.h], [ZAPTEL], [Zaptel])
else else