Changed the headers of usbdux, usbduxfast and usbduxsigma

[comedi.git] / m4 / as-linux.m4

diff --git a/m4/as-linux.m4 b/m4/as-linux.m4
index fb8a68ee009948495b243a02291cd518863479df..93107ea92627858d5d986ed08aa9f04e57fc9f5d 100644 (file)
--- a/m4/as-linux.m4
+++ b/m4/as-linux.m4
@@ -100,7 +100,7 @@ AC_DEFUN([AS_LINUX],
        dnl the versioned AS_LINUX macros just use the global variables
        dnl this could be cleaned up later on if we feel like it
        case $LINUX_VERSION_MAJOR.$LINUX_VERSION_MINOR in
-               2.6)
+               2.6 | 3.[[0-9]]*)
                        AS_LINUX_2_6()
                        ;;
                2.[[01234]])
@@ -772,7 +772,7 @@ AC_DEFUN([COMEDI_CHECK_LINUX_KBUILD],
 #
 # Check if kernel pcmcia support is new enough to have a probe member in the pcmcia_driver
 # struct.
-AC_DEFUN([COMEDI_CHECK_PCMCIA_PROBE],
+AC_DEFUN([COMEDI_CHECK_PCMCIA_DRIVER_PROBE],
 [
        AC_REQUIRE([AC_PROG_EGREP])
        AC_MSG_CHECKING([$1 for probe in pcmcia_driver struct])
@@ -786,6 +786,25 @@ AC_DEFUN([COMEDI_CHECK_PCMCIA_PROBE],
        fi
 ])
 
+# COMEDI_CHECK_PCMCIA_DRIVER_NAME([LINUX_SOURCE_PATH], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------------------------
+#
+# Check if kernel pcmcia support is new enough to have a name member in the pcmcia_driver
+# struct.
+AC_DEFUN([COMEDI_CHECK_PCMCIA_DRIVER_NAME],
+[
+       AC_REQUIRE([AC_PROG_EGREP])
+       AC_MSG_CHECKING([$1 for name in pcmcia_driver struct])
+       cat "$1/include/pcmcia/ds.h" | tr \\n ' ' | [$EGREP "struct[[:space:]]+pcmcia_driver[[:space:]]*[{][^}]*name"] > /dev/null
+       if (($?)); then
+               AC_MSG_RESULT([no])
+               $3
+       else
+               AC_MSG_RESULT([yes])
+               $2
+       fi
+])
+
 # COMEDI_CHECK_PCMCIA_LOOP_TUPLE([LINUX_SOURCE_PATH], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 # -------------------------------------------------------------
 #
@@ -887,6 +906,22 @@ AC_DEFUN([COMEDI_CHECK_HAVE_CS_TYPES_H],
        fi
 ])
 
+# COMEDI_CHECK_HAVE_CS_H([LINUX_SOURCE_PATH], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------------------------
+#
+# Check if kernel has <pcmcia/cs.h> file.
+AC_DEFUN([COMEDI_CHECK_HAVE_CS_H],
+[
+       AC_MSG_CHECKING([$1 for include/pcmcia/cs.h (removed in 2.6.37)])
+       if test -f "$1/include/pcmcia/cs.h"; then
+               AC_MSG_RESULT([yes])
+               $2
+       else
+               AC_MSG_RESULT([no])
+               $3
+       fi
+])
+
 # COMEDI_CHECK_HAVE_MUTEX_H([LINUX_SOURCE_PATH], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 # -------------------------------------------------------------
 #
@@ -918,3 +953,21 @@ AC_DEFUN([COMEDI_CHECK_HAVE_LINUX_SEMAPHORE_H],
                $3
        fi
 ])
+
+# COMEDI_CHECK_HAVE_GENERIC_BOOL_TYPE([LINUX_SOURCE_PATH], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# -------------------------------------------------------------
+# Check if kernel is new enough to have generic 'bool' type in <linux/types.h>
+# and 'false' and 'true' enum constants in <linux/stddef.h>.  This was added
+# in vanilla 2.6.19, but backported to RHEL5 2.6.18.
+AC_DEFUN([COMEDI_CHECK_HAVE_GENERIC_BOOL_TYPE],
+[
+       AC_MSG_CHECKING([$1 for 'bool' in include/linux/types.h])
+       if grep -q 'bool;' "$1/include/linux/types.h" 2>/dev/null; then
+               AC_MSG_RESULT([yes])
+               $2
+       else
+               AC_MSG_RESULT([no])
+               $3
+       fi
+])