diff options
| author | Mark Spencer <markster@digium.com> | 2004-06-04 15:44:14 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2004-06-04 15:44:14 +0000 |
| commit | 103bb4a33480fe9f7e484a851deaef458a40a69b (patch) | |
| tree | f162578b4f4db311cb01a087e412ca2a84c24d63 /channels | |
| parent | aa2795cc46ec5f9b3ec85f90990e72a67e164627 (diff) | |
Enhancements for zaptel+bsd (bug #1781)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3143 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/Makefile | 4 | ||||
| -rwxr-xr-x | channels/chan_iax2.c | 4 | ||||
| -rwxr-xr-x | channels/chan_zap.c | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/channels/Makefile b/channels/Makefile index fd0b796e5..c1ce59939 100755 --- a/channels/Makefile +++ b/channels/Makefile @@ -55,6 +55,7 @@ CHANNEL_LIBS+=chan_oss.so endif CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so) +CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so) CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so) CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations @@ -66,7 +67,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") +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") @@ -89,6 +90,7 @@ CFLAGS+=#-DVOFRDUMPER ZAPDIR=/usr/lib CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so") +CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so") CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" ) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index b0c1aa2d6..fa8e3df4c 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -57,7 +57,11 @@ #include <sys/stat.h> #ifdef IAX_TRUNKING #include <sys/ioctl.h> +#ifdef __linux__ #include <linux/zaptel.h> +#else +#include <zaptel.h> +#endif /* __linux__ */ #endif #ifdef MYSQL_FRIENDS #include <mysql/mysql.h> diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 905b21eab..431cd0b92 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -46,7 +46,11 @@ #include <stdint.h> #include <unistd.h> #include <sys/ioctl.h> +#ifdef __linux__ #include <linux/zaptel.h> +#else +#include <zaptel.h> +#endif /* __linux__ */ #include <math.h> #include <tonezone.h> #include <ctype.h> |