[Asterisk-cvs] zaptel Makefile,1.39,1.40 zaptel.h,1.29,1.30

[citats at lists.digium.com]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv28434

Modified Files:
	Makefile zaptel.h 
Log Message:
Change zaptel to not use DEVFS on 2.6 kernels


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/zaptel/Makefile,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Makefile	20 Mar 2004 08:04:39 -0000	1.39
+++ Makefile	26 Mar 2004 07:44:19 -0000	1.40
@@ -32,9 +32,13 @@
 
 INSTALL_PREFIX=
 
+BUILDVER=$(shell if uname -r | grep -q ^2.6; then echo "linux26"; else echo "linux24"; fi)
 MODCONF=$(shell if [ -d $(INSTALL_PREFIX)/etc/modprobe.d ]; then echo "$(INSTALL_PREFIX)/etc/modprobe.d/zaptel"; elif [ -d $(INSTALL_PREFIX)/etc/modutils ]; then echo "$(INSTALL_PREFIX)/etc/modutils/zaptel"; elif [ -f $(INSTALL_PREFIX)/etc/modprobe.conf ]; then echo "$(INSTALL_PREFIX)/modprobe.conf"; elif [ -f $(INSTALL_PREFIX)/etc/modules.conf ]; then echo "$(INSTALL_PREFIX)/etc/modules.conf"; else echo $(INSTALL_PREFIX)/etc/conf.modules ; fi)
 
+ifeq (${BUILDVER},linux24)
+#We only support DEVFS in linux 2.4 kernels, since its considered obsolete post 2.4
 DEVFS=$(shell ps ax | grep -v grep | grep devfsd)
+endif
 
 TZOBJS=zonedata.lo tonezone.lo
 LIBTONEZONE=libtonezone.so.1.0
@@ -53,7 +57,6 @@
 #PRIMARY=wcfxo
 PWD=$(shell pwd)
 
-BUILDVER=$(shell if uname -r | grep -q ^2.6; then echo "linux26"; else echo "linux24"; fi)
 all: $(BUILDVER)
 
 linux24: $(MODULESO) $(BINS)

Index: zaptel.h
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- zaptel.h	19 Mar 2004 04:03:05 -0000	1.29
+++ zaptel.h	26 Mar 2004 07:44:19 -0000	1.30
@@ -48,7 +48,12 @@
 #include "fasthdlc.h"
 #endif
 #ifdef CONFIG_DEVFS_FS
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 #include <linux/devfs_fs_kernel.h>
+#else
+#undef CONFIG_DEVFS_FS
+#warning "Zaptel doesn't support DEVFS in post 2.4 kernels.  Disabling DEVFS in zaptel"
+#endif
 #endif /* CONFIG_DEVFS_FS */
 #include <linux/ioctl.h>