Changed Makefile.modbuild to run configure script in empty environment to

prevent variables from a stale LINUXDIR from getting imported.  Finally
got comedi/Config.in to properly prompt for comedi_rt_timer depending
on whether we are using an RT kernel or not.

diff --git a/Makefile.modbuild b/Makefile.modbuild
index b777e692643c877733d0004175d7fd91d80ebd55..510164c693195f9f3bc4b68a36a3d667263cc869 100644 (file)
--- a/Makefile.modbuild
+++ b/Makefile.modbuild
@@ -62,10 +62,11 @@ all:        config
 endif
 
 oldconfig:     dummy
-       $(CONFIG_SHELL) ./configure --old
+       env -i $(CONFIG_SHELL) ./configure --old
 
+#configure is called through env -i to prevent loading of variables from stale LINUXDIR
 config:        dummy
-       $(CONFIG_SHELL) ./configure
+       env -i $(CONFIG_SHELL) ./configure --linuxdir $(LINUXDIR)
 
 modules_install:       $(patsubst %, _modinst_%, $(SUBDIRS))
        depmod -a

diff --git a/comedi/Config.in b/comedi/Config.in
index 524cfb8eeda28c40137762b4576fde4df3d20d31..7af2fdf46df67323434f7c96401e8581979edf65 100644 (file)
--- a/comedi/Config.in
+++ b/comedi/Config.in
@@ -1,30 +1,32 @@
 
 comment 'Comedi Features'
 
+CONFIG_COMEDI_RT=n
 if [ "$CONFIG_RTL" = "y" ];then
        bool 'Real-time support' CONFIG_COMEDI_RTL
        if [ "$CONFIG_COMEDI_RTL" = "y" ];then
-               define_bool CONFIG_COMEDI_RT y
+               CONFIG_COMEDI_RT=y
        fi
 fi
 if [ "$CONFIG_RTL_V1" = "y" ];then
        bool 'Real-time v1 support' CONFIG_COMEDI_RTL_V1
        if [ "$CONFIG_COMEDI_RTL_V1" = "y" ];then
-               define_bool CONFIG_COMEDI_RT y
+               CONFIG_COMEDI_RT=y
        fi
 fi
 if [ "$CONFIG_RTHAL" = "y" ];then
        bool 'Real-time support' CONFIG_COMEDI_RTAI
        if [ "$CONFIG_COMEDI_RTAI" = "y" ];then
-               define_bool CONFIG_COMEDI_RT y
+               CONFIG_COMEDI_RT=y
        fi
 fi
 if [ "$CONFIG_PRIORITY_IRQ" = "y" ];then
        bool 'Real-time support' CONFIG_COMEDI_PIRQ
        if [ "$CONFIG_COMEDI_PIRQ" = "y" ];then
-               define_bool CONFIG_COMEDI_RT y
+               CONFIG_COMEDI_RT=y
        fi
 fi
+define_bool CONFIG_COMEDI_RT $CONFIG_COMEDI_RT
 
 bool 'Verbose Debugging' CONFIG_COMEDI_DEBUG