Generate comedi/comedi_kbuild.inc at configure time instead of make time.

[comedi.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6df0aa4e1ff023daa6201ca08c34c7b0e39cd2a4..58a93e228199680e2abfab4040ea56b2fcfa80ec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 
-AC_INIT(comedi/comedi_fops.c)
-
-AM_CONFIG_HEADER(config.h)
+AC_INIT
+AC_CONFIG_SRCDIR([comedi/comedi_fops.c])
+AC_CONFIG_HEADERS(config.h)
 
 AC_CANONICAL_TARGET([])
 
@@ -12,9 +12,9 @@ fi
 PACKAGE=comedi
 COMEDI_MAJORVERSION=0
 COMEDI_MINORVERSION=7
-COMEDI_MICROVERSION=67
+COMEDI_MICROVERSION=73
 # set the nanoversion to 0 for releases, 1 for CVS, >= 2 for prereleases
-COMEDI_NANOVERSION=1
+COMEDI_NANOVERSION=0
 
 if test x$COMEDI_NANOVERSION = x0 ; then
   VERSION=$COMEDI_MAJORVERSION.$COMEDI_MINORVERSION.$COMEDI_MICROVERSION
@@ -32,16 +32,28 @@ AC_DEFINE_UNQUOTED(COMEDI_MINORVERSION, $COMEDI_MINORVERSION, [Comedi minor vers
 AC_DEFINE_UNQUOTED(COMEDI_MICROVERSION, $COMEDI_MICROVERSION, [Comedi micro version])
 
 AC_PROG_CC()
-AC_PATH_PROG(STRIP,strip)
+AM_PROG_CC_C_O
+AC_PATH_TOOL([STRIP],[strip])
+AC_PATH_PROG([DEPMOD], [depmod], [no], [$PATH:/sbin:/usr/sbin:/usr/local/sbin])
+if test "$DEPMOD" == "no" ; then
+       AC_MSG_ERROR([unable to find the 'depmod' program.])
+fi
 
 AS_LINUX()
 AS_LINUX_MODTOOL()
 
-DS_RTAI([USE_RTAI=yes],[USE_RTAI=no])
+AC_ARG_ENABLE([rtai], [  --disable-rtai        disable use of rtai],
+       [ENABLE_RTAI=$enableval], [ENABLE_RTAI="yes"])
+DS_RTAI([HAVE_RTAI=yes],[HAVE_RTAI=no])
+if test "$HAVE_RTAI" == "yes" -a "$ENABLE_RTAI" == "yes"; then
+       USE_RTAI="yes"
+else
+       USE_RTAI="no"
+fi
 DS_RTLINUX([USE_RTLINUX=yes],[USE_RTLINUX=no])
 AM_CONDITIONAL([CONFIG_COMEDI_RT],
-       [test ${USE_RTAI} == "yes" -o ${USE_RTLINUX} == "yes"])
-if test ${USE_RTAI} == "yes" -o ${USE_RTLINUX} == "yes" ; then
+       [test ${USE_RTAI} = "yes" -o ${USE_RTLINUX} = "yes"])
+if test ${USE_RTAI} = "yes" -o ${USE_RTLINUX} = "yes" ; then
        AC_DEFINE([CONFIG_COMEDI_RT],[true],[Define to enable Comedi's real-time support])
 fi
 
@@ -50,29 +62,48 @@ CC=$LINUX_CC
 
 #ERROR_CFLAGS="-Werror"
 
-[COMEDI_CFLAGS="$ERROR_CFLAGS -I\$(top_srcdir)/include/ -DKBUILD_MODNAME=\$(shell echo \$@ | sed 's/\(.*\)\.o/\1/g' | sed 's/\(.*\)_ko.*/\1/g')"]
+[COMEDI_CFLAGS="$ERROR_CFLAGS -I\$(top_srcdir)/include/\
+ -DKBUILD_MODNAME=\$(shell basename \$@ .o | sed 's/\(.*\)_ko.*/\1/g')\
+ -DKBUILD_BASENAME=\$(shell basename \$< .c)"]
 AC_SUBST(COMEDI_CFLAGS)
 
+COMEDI_CHECK_PCMCIA_PROBE([$LINUX_DIR], [ENABLE_PCMCIA="yes"], [ENABLE_PCMCIA="no"])
 AC_ARG_ENABLE([pcmcia],[  --disable-pcmcia     Disable support for PCMCIA devices],
-       [ENABLE_PCMCIA=$enableval],[ENABLE_PCMCIA="yes"])
-if test "$ENABLE_PCMCIA" == "yes" ; then
+       [ENABLE_PCMCIA=$enableval],[])
+if test "$ENABLE_PCMCIA" = "yes" ; then
        AS_LINUX_CONFIG_OPTION_MODULE(CONFIG_PCMCIA)
 else
        AC_MSG_NOTICE([PCMCIA support disabled])
        AM_CONDITIONAL(CONFIG_PCMCIA,false)
 fi
+AC_ARG_ENABLE([usb],[  --disable-usb           Disable support for USB devices],
+       [ENABLE_USB=$enableval],[ENABLE_USB="yes"])
+if test "$ENABLE_USB" = "yes" ; then
+       AS_LINUX_CONFIG_OPTION_MODULE(CONFIG_USB)
+else
+       AC_MSG_NOTICE([USB support disabled])
+       AM_CONDITIONAL(CONFIG_USB,false)
+fi
+COMEDI_CHECK_LINUX_KBUILD([$LINUX_DIR], [ENABLE_KBUILD="yes"], [ENABLE_KBUILD="no"])
+AC_ARG_ENABLE([kbuild], [  --enable-kbuild     Force use (or not) of kernel's Kbuild system to build modules (needs recent 2.6 kernel)],
+       [ENABLE_KBUILD=$enableval], [])
+AM_CONDITIONAL([CONFIG_KBUILD], [test ${ENABLE_KBUILD} = "yes"])
 AS_LINUX_CONFIG_OPTION_MODULE(CONFIG_ISA)
 AS_LINUX_CONFIG_OPTION_MODULE(CONFIG_PCI)
-AS_LINUX_CONFIG_OPTION_MODULE(CONFIG_USB)
 
 AC_DEFINE(CONFIG_COMEDI_DEBUG, true, [Define if debugging is enabled])
 AC_DEFINE(CONFIG_COMEDI_8255, true, [Define if 8255 support is enabled])
 
-AC_OUTPUT([
+DISTCHECK_CONFIGURE_FLAGS="--with-modulesdir=\\\$\$\(prefix\)/modules"
+AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
+
+AC_CONFIG_FILES([
 Makefile
 comedi/Makefile
+comedi/comedi_kbuild.inc
 comedi/drivers/Makefile
+comedi/drivers/addi-data/Makefile
 comedi/kcomedilib/Makefile
 ])
-#comedi/drivers/addi-data/Makefile
+AC_OUTPUT