diff -ur comedi-0.7.67.orig/m4/linux.m4 comedi-0.7.67/m4/linux.m4
--- comedi-0.7.67.orig/m4/linux.m4	2003-08-09 03:40:33 +0400
+++ comedi-0.7.67/m4/linux.m4	2003-08-23 10:10:00 +0400
@@ -1,5 +1,3 @@
-
-
 AC_DEFUN(DS_LINUX_DIR,
 [
 	AC_ARG_WITH([linuxdir],
@@ -46,9 +44,20 @@
 	AC_MSG_RESULT($result)
 ])
 
+AC_DEFUN(DS_KERNEL_SOURCE,
+[
+	AC_ARG_ENABLE([kernel-source],
+		[AC_HELP_STRING([--disable-kernel-source],
+			[disable search for CFLAGS in kernel source 
+			 (you must set appropriate variables manualy)])],
+		[ENABLE_KERNEL_SOURCE=no],
+		[ENABLE_KERNEL_SOURCE=yes])
+])
+
 AC_DEFUN(DS_LINUX,
 [
 	DS_LINUX_DIR()
+	DS_KERNEL_SOURCE()
 
 	AC_MSG_CHECKING([Linux version])
 
@@ -74,10 +83,50 @@
 
 	case $LINUX_VERSION_MAJOR.$LINUX_VERSION_MINOR in
 		2.6)
-			DS_LINUX_2_6()
+			if test "${ENABLE_KERNEL_SOURCE}" = "no" ; then
+				AC_MSG_CHECKING(for Linux CFLAGS)
+
+				LINUX_MODULE_EXT=".ko"
+
+				AC_SUBST(LINUX_ARCH)
+				AC_SUBST(LINUX_AFLAGS)
+				AC_SUBST(LINUX_LDFLAGS)
+				AC_SUBST(LINUX_ARFLAGS)
+				AC_SUBST(LINUX_CROSS_COMPILE)
+				AC_SUBST(LINUX_KERNELRELEASE)
+				AC_SUBST(LINUX_CFLAGS)
+				AC_SUBST(LINUX_CC)
+				AC_SUBST(LINUX_LD)
+				AC_SUBST(LINUX_AS)
+				AC_SUBST(LINUX_MODULE_EXT)
+
+				AC_MSG_RESULT([ok])
+			else
+				DS_LINUX_2_6()
+			fi
 			;;
 		2.[[01234]])
-			DS_LINUX_2_4()
+			if test "${ENABLE_KERNEL_SOURCE}" = "no" ; then
+				AC_MSG_CHECKING(for Linux CFLAGS)
+				
+				LINUX_MODULE_EXT=".o"
+
+				AC_SUBST(LINUX_ARCH)
+				AC_SUBST(LINUX_AFLAGS)
+				AC_SUBST(LINUX_LDFLAGS)
+				AC_SUBST(LINUX_ARFLAGS)
+				AC_SUBST(LINUX_CROSS_COMPILE)
+				AC_SUBST(LINUX_KERNELRELEASE)
+				AC_SUBST(LINUX_CFLAGS)
+				AC_SUBST(LINUX_CC)
+				AC_SUBST(LINUX_LD)
+				AC_SUBST(LINUX_AS)
+				AC_SUBST(LINUX_MODULE_EXT)
+
+				AC_MSG_RESULT([ok])
+			else
+				DS_LINUX_2_4()
+			fi
 			;;
 		*)
 			AC_MSG_ERROR([Unknown Linux major.minor $LINUX_VERSION_MAJOR.$LINUX_VERSION_MINOR])