aboutsummaryrefslogtreecommitdiffstats
path: root/channels/Makefile
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-05-27 22:12:55 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-05-27 22:12:55 +0000
commiteadbf9f9ca677d4e199de180018f5bf149338738 (patch)
treeff3e36b608b7a399e59482f7cc4ab5f5d1ee65d1 /channels/Makefile
parent12ce45cba733f2100d8a3d476f6ed900c5be74c1 (diff)
Merge OSS fixes for FreeBSD, implement rtptimeout and rtpholdtimeout
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3097 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/Makefile')
-rwxr-xr-xchannels/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/channels/Makefile b/channels/Makefile
index 32f611c92..40f5024f2 100755
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -47,10 +47,8 @@ CHANH323LIB=-ldl
endif
ifneq (${OSARCH},Darwin)
-ifneq (${OSARCH},FreeBSD)
CHANNEL_LIBS+=chan_oss.so
endif
-endif
CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
@@ -64,6 +62,7 @@ CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2")
CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+# xxx CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" )
CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX")