[asterisk-commits] branch group/autoconf_and_menuselect r18489 - /team/group/autoconf_and_menuse...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Sat Apr  8 13:51:42 2006
New Revision: 18489

URL: http://svn.digium.com/view/asterisk?rev=18489&view=rev
Log:
- remove a couple of unneeded filters of chan_oss
- change the IAX_TRUNKING define in chan_iax2 to use HAVE_ZAPTEL from autoconf

Modified:
    team/group/autoconf_and_menuselect/channels/Makefile
    team/group/autoconf_and_menuselect/channels/chan_iax2.c

Modified: team/group/autoconf_and_menuselect/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/Makefile?rev=18489&r1=18488&r2=18489&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/Makefile (original)
+++ team/group/autoconf_and_menuselect/channels/Makefile Sat Apr  8 13:51:42 2006
@@ -49,17 +49,9 @@
   H323LIB=-lh323_NetBSD_x86_r
 endif
 
-ifeq (${OSARCH},Darwin)
-  MODS:=$(filter-out chan_oss.so,$(MODS))
-endif
-
 ifeq (${OSARCH},SunOS)
   MODS:=$(filter-out chan_oss.so,$(MODS))
   SOLINK+=-lrt
-endif
-
-ifeq (${OSARCH},CYGWIN)
-  MODS:=$(filter-out chan_oss.so,$(MODS))
 endif
 
 ifeq (${WITH_SMDI},1)
@@ -85,20 +77,13 @@
   ALSA_SRC+=alsa-monitor.h
 endif
 
-ifndef WITHOUT_ZAPTEL
-ZAPAVAIL:=$(ZAPTEL)
-endif
-
-ifneq (${ZAPAVAIL},1)
-  MODS:=$(filter-out chan_zap.so,$(MODS))
-else
+ifneq ($(ZAPTEL_LIB),)
   ifeq (${OSARCH},NetBSD)
     SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
   endif
   ifeq (${OSARCH},FreeBSD)
     SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
   endif
-  CFLAGS+=-DIAX_TRUNKING
 endif
 
 ifneq ($(VPBAPI),1)

Modified: team/group/autoconf_and_menuselect/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/chan_iax2.c?rev=18489&r1=18488&r2=18489&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/chan_iax2.c (original)
+++ team/group/autoconf_and_menuselect/channels/chan_iax2.c Sat Apr  8 13:51:42 2006
@@ -49,7 +49,10 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <regex.h>
-#ifdef IAX_TRUNKING
+
+#include "asterisk.h"
+
+#ifdef HAVE_ZAPTEL
 #include <sys/ioctl.h>
 #ifdef __linux__
 #include <linux/zaptel.h>
@@ -57,8 +60,6 @@
 #include <zaptel.h>
 #endif /* __linux__ */
 #endif
-
-#include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
@@ -8936,7 +8937,7 @@
 
 static void set_timing(void)
 {
-#ifdef IAX_TRUNKING
+#ifdef HAVE_ZAPTEL
 	int bs = trunkfreq * 8;
 	if (timingfd > -1) {
 		if (
@@ -9962,7 +9963,7 @@
 	jb_setoutput(jb_error_output, jb_warning_output, NULL);
 #endif
 	
-#ifdef IAX_TRUNKING
+#ifdef HAVE_ZAPTEL
 #ifdef ZT_TIMERACK
 	timingfd = open("/dev/zap/timer", O_RDWR);
 	if (timingfd < 0)