Enhancements for zaptel+bsd (bug #1781)

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

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
 

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>

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"

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";
 

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;

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";

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";
 

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";