From f5506237680557de99a5c382674fbc5fb37cd420 Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Sat, 15 Dec 2001 06:52:16 +0000 Subject: [PATCH] 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. --- Makefile.modbuild | 5 +++-- comedi/Config.in | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile.modbuild b/Makefile.modbuild index b777e692..510164c6 100644 --- 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 524cfb8e..7af2fdf4 100644 --- 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 -- 2.26.2