issue #5634 and a little ChangeLog cleanup

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

ChangeLog

@@ -1,11 +1,13 @@
 2005-11-07  Kevin P. Fleming  <kpfleming@digium.com>
 
-	* Makefile: various fixes from issue #5633
+	* res/Makefile, apps/Makefile, channels/Makefile, Makefile: support WITHOUT_ZAPTEL define to forcibly avoid building Zaptel support (issue #5634)
+
+	* Makefile: various fixes (issue #5633)
 
 	* apps/app_osplookup.c: upgrade to new arg/option API and implement priority jumping control
 
-	* channels/chan_misdn.c: various fixes from issue #5639
-	* channels/misdn/isdn_lib.c: various fixes from issue #5639
+	* channels/chan_misdn.c: various fixes (issue #5639)
+	* channels/misdn/isdn_lib.c: various fixes (issue #5639)
 
 	* apps/app_playback.c: upgrade to new arg/option API and implement priority jumping control
 

Makefile

@@ -293,10 +293,14 @@ LIBS+=-lpthread -lncurses -lm -lresolv
 ASTSBINDIR=$(MODULES_DIR)
 endif
 
+ifndef WITHOUT_ZAPTEL
+
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
   ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
 endif
 
+endif # WITHOUT_ZAPTEL
+
 LIBEDIT=editline/libedit.a
 
 ifneq ($(wildcard .version),)

apps/Makefile

@@ -44,9 +44,11 @@ APPS=app_dial.so app_playback.so app_voicemail.so app_directory.so app_mp3.so\
 #APPS+=app_skel.so
 #APPS+=app_rpt.so
 
+ifndef WITHOUT_ZAPTEL
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
   APPS+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so
 endif
+endif # WITHOUT_ZAPTEL
 
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
 APPS+=app_osplookup.so
@@ -88,7 +90,7 @@ clean:
 
 %.so : %.o
 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
-	
+
 app_rpt.so : app_rpt.o
 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -ltonezone
 

channels/Makefile

@@ -104,6 +104,7 @@ ifneq ($(wildcard alsa-monitor.h),)
   ALSA_SRC+=alsa-monitor.h
 endif
 
+ifndef WITHOUT_ZAPTEL
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
   ifeq (${OSARCH},NetBSD)
     SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
@@ -114,6 +115,7 @@ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard
   CFLAGS+=-DIAX_TRUNKING
   CHANNEL_LIBS+=chan_zap.so
 endif
+endif # WITHOUT_ZAPTEL
 
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),)
   CHANNEL_LIBS+=chan_vpb.so

res/Makefile

@@ -53,9 +53,11 @@ CRYPTO_LIBS=-lssl -lcrypto
 
 CFLAGS+=
 
+ifndef WITHOUT_ZAPTEL
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
   CFLAGS+=-DZAPATA_MOH
 endif
+endif # WITHOUT_ZAPTEL
 
 #
 # Work around buggy RedHat 9.0