s526: don't dereference insn->data

[comedi.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2b518888fcf51fa8460e36fff6a58aea2eb37189..7f788b7ff11e8b2851dbc1ec8e2ab4b32e5d0d3d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ PACKAGE=comedi
 COMEDI_MAJORVERSION=0
 COMEDI_MINORVERSION=7
 COMEDI_MICROVERSION=76
-# set the nanoversion to 0 for releases, 1 for CVS, >= 2 for prereleases
+# set the nanoversion to 0 for releases, 1 for Git, >= 2 for prereleases
 COMEDI_NANOVERSION=0
 
 if test x$COMEDI_NANOVERSION = x0 ; then
@@ -87,7 +87,7 @@ else
 fi
 AM_CONDITIONAL([CONFIG_COMEDI_PCI],[test "$USE_PCI" = "yes"])
 
-COMEDI_CHECK_PCMCIA_PROBE([$LINUX_SRC_DIR],
+COMEDI_CHECK_PCMCIA_DRIVER_PROBE([$LINUX_SRC_DIR],
        [AS_CHECK_LINUX_CONFIG_OPTION([CONFIG_PCMCIA],
                [HAVE_PCMCIA="yes"],[HAVE_PCMCIA="yes"],[HAVE_PCMCIA="no"])],
        [HAVE_PCMCIA="no"])
@@ -110,6 +110,12 @@ else
 fi
 AM_CONDITIONAL([CONFIG_COMEDI_PCMCIA],[test "$USE_PCMCIA" = "yes"])
 
+COMEDI_CHECK_PCMCIA_DRIVER_NAME([$LINUX_SRC_DIR],
+      [HAVE_PCMCIA_DRIVER_NAME="yes"], [HAVE_PCMCIA_DRIVER_NAME="no"])
+if test "$HAVE_PCMCIA_DRIVER_NAME" = "yes" ; then
+       AC_DEFINE([CONFIG_COMEDI_HAVE_PCMCIA_DRIVER_NAME],[true],[Define if Linux kernel source has name member in struct pcmcia_driver])
+fi
+
 COMEDI_CHECK_PCMCIA_LOOP_TUPLE([$LINUX_SRC_DIR],
       [HAVE_PCMCIA_LOOP_TUPLE="yes"], [HAVE_PCMCIA_LOOP_TUPLE="no"])
 if test "$HAVE_PCMCIA_LOOP_TUPLE" = "yes" ; then
@@ -146,6 +152,25 @@ if test "$HAVE_CS_TYPES_H" = "yes" ; then
        AC_DEFINE([CONFIG_COMEDI_HAVE_CS_TYPES_H],[true],[Define if Linux kernel source has pcmcia/cs_types.h (removed in 2.6.36)])
 fi
 
+COMEDI_CHECK_HAVE_CS_H([$LINUX_SRC_DIR],
+      [HAVE_CS_H="yes"], [HAVE_CS_H="no"])
+if test "$HAVE_CS_TYPES_H" = "yes" ; then
+       AC_DEFINE([CONFIG_COMEDI_HAVE_CS_H],[true],[Define if Linux kernel source has pcmcia/cs.h (removed in 2.6.37)])
+fi
+
+COMEDI_CHECK_HAVE_GENERIC_BOOL_TYPE([$LINUX_SRC_DIR],
+      [HAVE_GENERIC_BOOL_TYPE="yes"], [HAVE_GENERIC_BOOL_TYPE="no"])
+if test "$HAVE_GENERIC_BOOL_TYPE" = "yes" ; then
+       AC_DEFINE([CONFIG_COMEDI_HAVE_GENERIC_BOOL_TYPE],[true],[Define if Linux kernel source has generic 'bool' type in linux/types.h])
+fi
+
+COMEDI_CHECK_REQUEST_FIRMWARE_NOWAIT_HAS_GFP([$LINUX_SRC_DIR],
+       [REQUEST_FIRMWARE_NOWAIT_HAS_GFP="yes"],
+       [REQUEST_FIRMWARE_NOWAIT_HAS_GFP="no"])
+if test "$REQUEST_FIRMWARE_NOWAIT_HAS_GFP" = "yes" ; then
+       AC_DEFINE([CONFIG_COMEDI_REQUEST_FIRMWARE_NOWAIT_HAS_GFP],[true],[Define if Linux kernel 'request_firmware_nowait' function has 'gfp' parameter])
+fi
+
 AS_CHECK_LINUX_CONFIG_OPTION([CONFIG_USB],[HAVE_USB="yes"],[HAVE_USB="yes"],[HAVE_USB="no"])
 AM_CONDITIONAL([CONFIG_USB],[test "$HAVE_USB" = "yes"])
 AC_ARG_ENABLE([usb],[  --disable-usb           Disable support for USB devices],