Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv13947
Modified Files:
ChangeLog Makefile
Log Message:
issue #5634 and a little ChangeLog cleanup
Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- ChangeLog 8 Nov 2005 00:08:09 -0000 1.50
+++ ChangeLog 8 Nov 2005 00:12:21 -0000 1.51
@@ -1,11 +1,13 @@
2005-11-07 Kevin P. Fleming <[EMAIL PROTECTED]>
- * 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
Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- Makefile 8 Nov 2005 00:08:09 -0000 1.221
+++ Makefile 8 Nov 2005 00:12:21 -0000 1.222
@@ -293,10 +293,14 @@
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),)
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
