changes to Configure for modbuild, and update to config.dist

diff --git a/scripts/Configure b/scripts/Configure
index eec81bbbee05a13452f5a78134e5345040c9a9d7..208ac9b49ad3edbb6b1f5f833a588f45c03b4c39 100755 (executable)
--- a/scripts/Configure
+++ b/scripts/Configure
@@ -1,5 +1,8 @@
 #! /bin/sh
 #
+#  This script was hacked from Linux-2.2.17
+#
+#
 # This script is used to configure the Linux kernel.
 #
 # It was inspired by the challenge in the original Configure script
@@ -49,6 +52,8 @@
 # 24 January 1999, Michael Elizabeth Chastain, <mec@shout.net>
 # - Improve the exit message (Jeff Ronne).
 
+. scripts/preconfigure
+
 #
 # Make sure we're really running bash.
 #
@@ -527,12 +532,13 @@ if [ "$1" = "-d" ] ; then
        shift
 fi
 
-CONFIG_IN=./config.in
+CONFIG_IN=./scripts/config.in
 if [ "$1" != "" ] ; then
        CONFIG_IN=$1
 fi
 
-DEFAULTS=arch/$ARCH/defconfig
+#DEFAULTS=arch/$ARCH/defconfig
+DEFAULTS=scripts/config.dist
 if [ -f .config ]; then
   DEFAULTS=.config
 fi
@@ -558,16 +564,15 @@ if [ -f .config ]; then
        mv .config .config.old
 fi
 mv .tmpconfig .config
-mv .tmpconfig.h include/linux/autoconf.h
-
-echo
-echo "*** End of Linux kernel configuration."
-echo "*** Check the top-level Makefile for additional configuration."
-if [ ! -f .hdepend -o "$CONFIG_MODVERSIONS" = "y" ] ; then
-    echo "*** Next, you must run 'make dep'."
-else
-    echo "*** Next, you may run 'make zImage', 'make zdisk', or 'make zlilo'."
-fi
+#mv .tmpconfig.h include/linux/autoconf.h
+mv .tmpconfig.h include/modbuild/config.h
+
+echo 
+echo "Makefiles for ${project} should now be configured."
+echo "Run 'make dep ; make' to compile, and then 'make install' to install."
+echo 
+echo "If ${project} has never been installed on your system,"
+echo "then run 'make dev' to build the device nodes '/dev/comedi*'."
 echo
 
 exit 0

diff --git a/scripts/config.dist b/scripts/config.dist
index 3b76f717a8de5fd20300f59b6c02b996e5caa65a..a4086f6895b1e7ce46ec17a7a26d0d8101c8fbdd 100644 (file)
--- a/scripts/config.dist
+++ b/scripts/config.dist
@@ -56,4 +56,5 @@ CONFIG_COMEDI_II_PCI20KC=m
 CONFIG_COMEDI_QUATECH_DAQP=m
 CONFIG_COMEDI_DAQBOARD2000=m
 # CONFIG_COMEDI_DAQBOARD2000_FPGA is not set
+CONFIG_COMEDI_POC=m
 CONFIG_COMEDI_SKEL=m