diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2004-12-13 13:35:02 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2004-12-13 13:35:02 +0000 |
commit | f40fa78a35930d3c24c89f2c124b7c2957244e68 (patch) | |
tree | d7cf6828818a440ee9c86fdc72db932cb0e50d07 /net/asterisk/files/patch-channels::Makefile | |
parent | Updated to 1.10 (diff) |
o Update to 1.0.2.
o Add often requested knobs WITHOUT_H323 and WITHOUT_ZAPTEL.
o Add untested support for building on sparc64.
Notes
Notes:
svn path=/head/; revision=123930
Diffstat (limited to 'net/asterisk/files/patch-channels::Makefile')
-rw-r--r-- | net/asterisk/files/patch-channels::Makefile | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/net/asterisk/files/patch-channels::Makefile b/net/asterisk/files/patch-channels::Makefile index f10e4bcbf3eb..e82a0299756d 100644 --- a/net/asterisk/files/patch-channels::Makefile +++ b/net/asterisk/files/patch-channels::Makefile @@ -1,8 +1,8 @@ $FreeBSD$ ---- channels/Makefile.orig Tue Aug 31 19:33:00 2004 -+++ channels/Makefile Sun Oct 10 16:18:05 2004 +--- channels/Makefile.orig ++++ channels/Makefile @@ -57,10 +57,10 @@ endif @@ -18,18 +18,20 @@ $FreeBSD$ endif ifeq (${OSARCH},NetBSD) PTLIB=-lpt_NetBSD_x86_r -@@ -72,8 +72,8 @@ +@@ -72,8 +72,10 @@ 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) +CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/ixjuser.h ] && echo chan_phone.so) ++ifndef WITHOUT_H323 +CHANNEL_LIBS+=chan_h323.so ++endif CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API") -@@ -84,7 +84,7 @@ +@@ -84,7 +86,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") @@ -38,7 +40,7 @@ $FreeBSD$ CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" ) CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX") -@@ -107,7 +107,7 @@ +@@ -107,7 +109,7 @@ ZAPDIR=/usr/lib CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so") @@ -47,7 +49,7 @@ $FreeBSD$ CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" ) -@@ -156,6 +156,8 @@ +@@ -156,6 +158,8 @@ chan_oss.so: chan_oss.o $(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio endif @@ -56,7 +58,7 @@ $FreeBSD$ chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o ifeq ($(USE_MYSQL_FRIENDS),1) -@@ -175,7 +177,7 @@ +@@ -175,7 +179,7 @@ $(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c chan_zap.so: chan_zap.o @@ -65,7 +67,7 @@ $FreeBSD$ chan_sip.so: chan_sip.o ifeq ($(USE_SIP_MYSQL_FRIENDS),1) -@@ -199,15 +201,17 @@ +@@ -199,15 +203,17 @@ chan_vpb.so: chan_vpb.o $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl |