diff -rub ../../ast-vendor/asterisk/Makefile ./Makefile --- ../../ast-vendor/asterisk/Makefile Thu Jun 3 19:04:58 2004 +++ ./Makefile Thu Jun 3 17:49:35 2004 @@ -127,6 +130,7 @@ #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 Binary files ../../ast-vendor/asterisk/agi/eagi-sphinx-test and ./agi/eagi-sphinx-test differ Binary files ../../ast-vendor/asterisk/agi/eagi-test and ./agi/eagi-test differ diff -rub ../../ast-vendor/asterisk/apps/Makefile ./apps/Makefile --- ../../ast-vendor/asterisk/apps/Makefile Wed Jun 2 17:51:00 2004 +++ ./apps/Makefile Thu Jun 3 18:46:43 2004 @@ -38,6 +38,7 @@ #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 -rub ../../ast-vendor/asterisk/apps/app_flash.c ./apps/app_flash.c --- ../../ast-vendor/asterisk/apps/app_flash.c Fri May 21 17:00:53 2004 +++ ./apps/app_flash.c Thu Jun 3 18:47:36 2004 @@ -21,7 +21,11 @@ #include #include #include +#ifdef __linux__ #include +#else +#include +#endif /* __linux__ */ #include #include #include diff -rub ../../ast-vendor/asterisk/apps/app_intercom.c ./apps/app_intercom.c --- ../../ast-vendor/asterisk/apps/app_intercom.c Thu Jun 3 19:06:42 2004 +++ ./apps/app_intercom.c Thu Jun 3 18:49:09 2004 @@ -26,14 +26,15 @@ #include #include #include -#ifdef __linux__ +#include + +#if defined(__linux__) #include #elif defined(__FreeBSD__) #include #else #include #endif -#include #ifdef __OpenBSD__ #define DEV_DSP "/dev/audio" diff -rub ../../ast-vendor/asterisk/apps/app_meetme.c ./apps/app_meetme.c --- ../../ast-vendor/asterisk/apps/app_meetme.c Thu Jun 3 19:06:42 2004 +++ ./apps/app_meetme.c Thu Jun 3 18:49:48 2004 @@ -31,9 +31,13 @@ #include #include #include - #include + +#ifdef __linux__ #include +#else +#include +#endif /* __linux__ */ static char *tdesc = "MeetMe conference bridge"; Only in ./apps: app_meetme.c.merge-left.r5 Only in ./apps: app_meetme.c.merge-right.r7 Only in ./apps: app_meetme.c.working diff -rub ../../ast-vendor/asterisk/apps/app_rpt.c ./apps/app_rpt.c --- ../../ast-vendor/asterisk/apps/app_rpt.c Wed Jun 2 17:51:00 2004 +++ ./apps/app_rpt.c Thu Jun 3 18:50:37 2004 @@ -61,7 +61,12 @@ #include #include #include + +#ifdef __linux__ #include +#else +#include +#endif /* __linux__ */ static char *tdesc = "Radio Repeater / Remote Base version 0.2 05/30/2004"; static int debug = 0; diff -rub ../../ast-vendor/asterisk/apps/app_zapbarge.c ./apps/app_zapbarge.c --- ../../ast-vendor/asterisk/apps/app_zapbarge.c Fri May 21 17:00:52 2004 +++ ./apps/app_zapbarge.c Thu Jun 3 18:51:27 2004 @@ -32,9 +32,14 @@ #include #include #include - #include + +#ifdef __linux__ #include +#else +#include +#endif /* __linux__ */ + static char *tdesc = "Barge in on Zap channel application"; static char *app = "ZapBarge"; diff -rub ../../ast-vendor/asterisk/apps/app_zapras.c ./apps/app_zapras.c --- ../../ast-vendor/asterisk/apps/app_zapras.c Fri May 21 17:00:52 2004 +++ ./apps/app_zapras.c Thu Jun 3 18:51:42 2004 @@ -33,7 +33,11 @@ #include /* Need some zaptel help here */ +#ifdef __linux__ #include +#else +#include +#endif /* __linux__ */ static char *tdesc = "Zap RAS Application"; diff -rub ../../ast-vendor/asterisk/apps/app_zapscan.c ./apps/app_zapscan.c --- ../../ast-vendor/asterisk/apps/app_zapscan.c Fri May 21 17:00:52 2004 +++ ./apps/app_zapscan.c Thu Jun 3 18:52:13 2004 @@ -33,9 +33,14 @@ #include #include #include - #include + +#ifdef __linux__ #include +#else +#include +#endif /* __linux__ */ + static char *tdesc = "Scan Zap channels application"; static char *app = "ZapScan"; Binary files ../../ast-vendor/asterisk/asterisk and ./asterisk differ Only in .: asterisk.core diff -rub ../../ast-vendor/asterisk/astman/Makefile ./astman/Makefile --- ../../ast-vendor/asterisk/astman/Makefile Fri May 21 17:00:50 2004 +++ ./astman/Makefile Thu Jun 3 18:55:31 2004 @@ -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 @@ 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 Only in .: bash.core diff -rub ../../ast-vendor/asterisk/channel.c ./channel.c --- ../../ast-vendor/asterisk/channel.c Thu Jun 3 19:06:42 2004 +++ ./channel.c Thu Jun 3 18:45:41 2004 @@ -40,7 +40,11 @@ #include #ifdef ZAPTEL_OPTIMIZATIONS #include +#ifdef __linux__ #include +#else +#include +#endif /* __linux__ */ #ifndef ZT_TIMERPING #error "You need newer zaptel! Please cvs update zaptel" #endif diff -rub ../../ast-vendor/asterisk/channels/Makefile ./channels/Makefile --- ../../ast-vendor/asterisk/channels/Makefile Thu Jun 3 19:05:54 2004 +++ ./channels/Makefile Thu Jun 3 18:58:34 2004 @@ -55,6 +55,7 @@ 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 @@ 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 @@ 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 -rub ../../ast-vendor/asterisk/channels/chan_iax2.c ./channels/chan_iax2.c --- ../../ast-vendor/asterisk/channels/chan_iax2.c Thu Jun 3 19:06:43 2004 +++ ./channels/chan_iax2.c Thu Jun 3 18:59:09 2004 @@ -57,7 +57,11 @@ #include #ifdef IAX_TRUNKING #include +#ifdef __linux__ #include +#else +#include +#endif /* __linux__ */ #endif #ifdef MYSQL_FRIENDS #include diff -rub ../../ast-vendor/asterisk/channels/chan_zap.c ./channels/chan_zap.c --- ../../ast-vendor/asterisk/channels/chan_zap.c Thu Jun 3 19:06:43 2004 +++ ./channels/chan_zap.c Thu Jun 3 19:02:27 2004 @@ -46,7 +46,11 @@ #include #include #include +#ifdef __linux__ #include +#else +#include +#endif /* __linux__ */ #include #include #include diff -rub ../../ast-vendor/asterisk/res/Makefile ./res/Makefile --- ../../ast-vendor/asterisk/res/Makefile Fri May 21 17:01:02 2004 +++ ./res/Makefile Thu Jun 3 19:03:04 2004 @@ -17,6 +17,7 @@ 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 -rub ../../ast-vendor/asterisk/res/res_musiconhold.c ./res/res_musiconhold.c --- ../../ast-vendor/asterisk/res/res_musiconhold.c Thu Jun 3 19:06:43 2004 +++ ./res/res_musiconhold.c Thu Jun 3 19:03:40 2004 @@ -37,7 +37,11 @@ #include #include #ifdef ZAPATA_MOH +#ifdef __linux__ #include +#else +#include +#endif /* __linux__ */ #endif #include #include