Enhancements for zaptel+bsd (bug #1781)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3143 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index c2bad988a313b7518fb7628cadaf48752ebf67fd..0101ebc49e96c7b17f5db4ad80be6955674f2c75 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -127,6 +127,7 @@ endif
 #CFLAGS+=-DOLD_DSP_ROUTINES
 
 CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
+CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
 
 LIBEDIT=editline/libedit.a
 

diff --git a/apps/Makefile b/apps/Makefile
index a51f5a03647bf5ec831ef9df2b6fbad4086622f7..5ff4a69cc7dd2f942f1cda9d28cb344a22954ec5 100755 (executable)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -38,6 +38,7 @@ endif
 #APPS+=app_rpt.so
 
 APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
 
 CFLAGS+=-fPIC
 

diff --git a/apps/app_flash.c b/apps/app_flash.c
index 902b7506cf04e5afcbe677ea907e5dc81f5c3c0e..45d1e25cfd488e5b98def8def2e7cec678f1d671 100755 (executable)
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -21,7 +21,11 @@
 #include <asterisk/image.h>
 #include <asterisk/options.h>
 #include <sys/ioctl.h>
+#ifdef __linux__
 #include <linux/zaptel.h>
+#else
+#include <zaptel.h>
+#endif /* __linux__ */
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>

diff --git a/apps/app_intercom.c b/apps/app_intercom.c
index 1652aaa0bd265fb3d2108d743100e4de66b5c669..a4d863697479d59ee722d16ad40a4610edb25682 100755 (executable)
--- a/apps/app_intercom.c
+++ b/apps/app_intercom.c
@@ -26,14 +26,15 @@
 #include <stdlib.h>
 #include <pthread.h>
 #include <sys/time.h>
-#ifdef __linux__
+#include <netinet/in.h>
+
+#if defined(__linux__)
 #include <linux/soundcard.h>
 #elif defined(__FreeBSD__)
 #include <sys/soundcard.h>
 #else
 #include <soundcard.h>
 #endif
-#include <netinet/in.h>
 
 #ifdef __OpenBSD__
 #define DEV_DSP "/dev/audio"

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 98b423734c4c910de60ab72ec9d4f9395636c173..591ea5af8b8db23e54e3d3e8522475b695db2d45 100755 (executable)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -31,9 +31,13 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
-
 #include <pthread.h>
+
+#ifdef __linux__
 #include <linux/zaptel.h>
+#else
+#include <zaptel.h>
+#endif /* __linux__ */
 
 static char *tdesc = "MeetMe conference bridge";
 

diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index 9325d39bae5faf72a257b22ba5464090b20ef3c7..e6973725c8f6043aef5765d4b99cae8077189649 100755 (executable)
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -61,7 +61,12 @@ enum {REM_OFF,REM_MONITOR,REM_TX};
 #include <sys/ioctl.h>
 #include <math.h>
 #include <tonezone.h>
+
+#ifdef __linux__
 #include <linux/zaptel.h>
+#else
+#include <zaptel.h>
+#endif /* __linux__ */
 
 static  char *tdesc = "Radio Repeater / Remote Base  version 0.2  05/30/2004";
 static int debug = 0;

diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c
index 1dd9dd3bcde92d92a202e2a479c31d1930d76fd2..6d455ce4aa74f9097737e7c1510726e56d1b4fda 100755 (executable)
--- a/apps/app_zapbarge.c
+++ b/apps/app_zapbarge.c
@@ -32,9 +32,14 @@
 #include <string.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
-
 #include <pthread.h>
+
+#ifdef __linux__
 #include <linux/zaptel.h>
+#else
+#include <zaptel.h>
+#endif /* __linux__ */
+
 static char *tdesc = "Barge in on Zap channel application";
 
 static char *app = "ZapBarge";

diff --git a/apps/app_zapras.c b/apps/app_zapras.c
index 9d88a06e30c979b0f9646021ce92bbada1968085..b1cc5fbe0079ff73f746dd83efde2d2377861335 100755 (executable)
--- a/apps/app_zapras.c
+++ b/apps/app_zapras.c
@@ -33,7 +33,11 @@
 #include <pthread.h>
 
 /* Need some zaptel help here */
+#ifdef __linux__
 #include <linux/zaptel.h>
+#else
+#include <zaptel.h>
+#endif /* __linux__ */
 
 static char *tdesc = "Zap RAS Application";
 

diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index 58a456f3856c1dbfbb12cdfbf17fdd83f00622dc..f449c7f363da2780d0634445b78121f83b01df62 100755 (executable)
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -33,9 +33,14 @@
 #include <string.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
-
 #include <pthread.h>
+
+#ifdef __linux__
 #include <linux/zaptel.h>
+#else
+#include <zaptel.h>
+#endif /* __linux__ */
+
 static char *tdesc = "Scan Zap channels application";
 
 static char *app = "ZapScan";

diff --git a/astman/Makefile b/astman/Makefile
index 476c4915c72a86d256b81b22f60a668aa5d095ff..06bed92fa07f30ffe2cf176a386e6cdf741a847e 100755 (executable)
--- a/astman/Makefile
+++ b/astman/Makefile
@@ -2,7 +2,14 @@
 # Don't use ast mm routines
 #
 CFLAGS+=-DNO_AST_MM
+
+OSARCH=$(shell uname -s)
+ifeq (${OSARCH},FreeBSD)
+CFLAGS+=-I/usr/local/include -L/usr/local/lib
+endif
+
 TARGET=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else echo "none" ; fi)
+TARGET=$(shell if [ -f /usr/local/include/newt.h ]; then echo "astman"; else echo "none" ; fi)
 all: depend $(TARGET)
 
 install:
@@ -19,7 +26,7 @@ clean:
        rm -f *.o astman .depend
 
 astman: astman.o ../md5.o
-       $(CC) -o astman astman.o ../md5.o -lnewt
+       $(CC) $(CFLAGS) -o astman astman.o ../md5.o -lnewt
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/channel.c b/channel.c
index f31c0122964c902375b760e87a6eb690d8be3b0a..b3ba99743e9b1e2b8d36491245ddc118bc52b501 100755 (executable)
--- a/channel.c
+++ b/channel.c
@@ -40,7 +40,11 @@
 #include <asterisk/utils.h>
 #ifdef ZAPTEL_OPTIMIZATIONS
 #include <sys/ioctl.h>
+#ifdef __linux__
 #include <linux/zaptel.h>
+#else
+#include <zaptel.h>
+#endif /* __linux__ */
 #ifndef ZT_TIMERPING
 #error "You need newer zaptel!  Please cvs update zaptel"
 #endif

diff --git a/channels/Makefile b/channels/Makefile
index fd0b796e5e5aa2ccbcc690aeed9a598af9fcc2cf..c1ce59939dac839158dd103321d2dbe28acd8b18 100755 (executable)
--- 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 b0c1aa2d6f73b2d31cfd295440ecd5caf9d249f6..fa8e3df4c7c1123360163cda0e71b6345537fa2e 100755 (executable)
--- 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 905b21eabd3a621c39fe25d914325ad1b0e9f77b..431cd0b9206ff5c82f6ff574ea6428499f54b849 100755 (executable)
--- 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>

diff --git a/res/Makefile b/res/Makefile
index 242a0616335e34720d939b3c29c238c721e6cc07..32e42a2e2299633d2550c69c6bda6d1f71759d56 100755 (executable)
--- a/res/Makefile
+++ b/res/Makefile
@@ -17,6 +17,7 @@ CRYPTO_LIBS=-lssl -lcrypto
 
 CFLAGS+=
 CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH")
+CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH")
 #
 # Work around buggy RedHat 9.0
 #

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 06798c274c3f2fe9e4ff398c27e5abfb38a94fa0..d6bc6c760e54e1a4ee8cceeab884698cd87c10a5 100755 (executable)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -37,7 +37,11 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #ifdef ZAPATA_MOH
+#ifdef __linux__
 #include <linux/zaptel.h>
+#else
+#include <zaptel.h>
+#endif /* __linux__ */
 #endif
 #include <unistd.h>
 #include <sys/ioctl.h>