diff options
| author | Guillem Jover <guillem@debian.org> | 2004-10-25 07:49:23 +0000 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2004-10-25 07:49:23 +0000 |
| commit | 6672e526f063727798ad105c50b50e7e69f32eed (patch) | |
| tree | dbced8c00023a754a22e65f1edbb6ed6dce57e69 | |
| parent | a49f5dfaf2fef843edb413dcc8639df986459dff (diff) | |
Added regeneration instructions.
Sync with latest autotools changes.
| -rw-r--r-- | debian/patches/90_autoconf_autogen.patch | 1511 |
1 files changed, 818 insertions, 693 deletions
diff --git a/debian/patches/90_autoconf_autogen.patch b/debian/patches/90_autoconf_autogen.patch index 7a49315..19e6984 100644 --- a/debian/patches/90_autoconf_autogen.patch +++ b/debian/patches/90_autoconf_autogen.patch @@ -1,11 +1,15 @@ #DPATCHLEVEL=1 This patch is just autogenerated stuff, do not hack directly on it. +Regenerate with: + + autoreconf -fis + find -name autom4te.cache | xargs rm -rf diff -Naur gnumach-20040915.orig/configure gnumach-20040915/configure --- gnumach-20040915.orig/configure 2002-05-23 02:06:35.000000000 +0200 -+++ gnumach-20040915/configure 2004-09-18 22:28:41.000000000 +0200 ++++ gnumach-20040915/configure 2004-10-25 06:48:10.000000000 +0200 @@ -1,31 +1,293 @@ #! /bin/sh - @@ -4785,7 +4789,7 @@ diff -Naur gnumach-20040915.orig/configure gnumach-20040915/configure diff -Naur gnumach-20040915.orig/i386/configure gnumach-20040915/i386/configure --- gnumach-20040915.orig/i386/configure 1999-05-01 02:34:06.000000000 +0200 -+++ gnumach-20040915/i386/configure 2004-09-18 22:28:36.000000000 +0200 ++++ gnumach-20040915/i386/configure 2004-10-25 06:48:09.000000000 +0200 @@ -1,28 +1,289 @@ #! /bin/sh - @@ -7851,7 +7855,7 @@ diff -Naur gnumach-20040915.orig/i386/configure gnumach-20040915/i386/configure diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linux/configure --- gnumach-20040915.orig/i386/linux/configure 2001-05-27 14:44:22.000000000 +0200 -+++ gnumach-20040915/i386/linux/configure 2004-09-18 22:28:24.000000000 +0200 ++++ gnumach-20040915/i386/linux/configure 2004-10-25 06:48:07.000000000 +0200 @@ -1,392 +1,288 @@ #! /bin/sh - @@ -8010,9 +8014,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +done +;; + esac - --# Defaults: --ac_help= ++ + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real @@ -8086,7 +8088,9 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -+ + +-# Defaults: +-ac_help= +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + @@ -8948,11 +8952,8 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -+ ac_option=--`echo $ac_prev | sed 's/_/-/g'` -+ { echo "$as_me: error: missing argument to $ac_option" >&2 -+ { (exit 1); exit 1; }; } - fi - +-fi +- -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: @@ -8967,9 +8968,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu - exec 6>/dev/null -else - exec 6>&1 --fi ++ ac_option=--`echo $ac_prev | sed 's/_/-/g'` ++ { echo "$as_me: error: missing argument to $ac_option" >&2 ++ { (exit 1); exit 1; }; } + fi -exec 5>./config.log -- + -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. @@ -9071,7 +9075,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. -@@ -835,13 +690,648 @@ +@@ -835,13 +690,654 @@ fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then @@ -9241,7 +9245,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + --enable-epic100 enable driver alias epic100 + --enable-floppy enable driver floppy + --enable-ide enable driver ide -+ --enable-forcedma enable forced use of DMA ++ --enable-ide-forcedma enable forced use of DMA on IDE + --enable-advansys enable driver alias advansys + --enable-advansys enable driver advansys + --enable-BusLogic enable driver alias BusLogic @@ -9299,12 +9303,18 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + --enable-gdth enable driver alias gdth + --enable-gdth enable driver gdth + --enable-flashpoint enable SCSI flashpoint [default=no] ++ --enable-starfire enable driver alias starfire ++ --enable-starfire enable driver starfire + --enable-sundance enable driver alias sundance + --enable-sundance enable driver sundance + --enable-winbond-840 enable driver alias winbond-840 + --enable-winbond_840 enable driver winbond_840 + --enable-hamachi enable driver alias hamachi + --enable-hamachi enable driver hamachi ++ --enable-intel-gige enable driver alias intel-gige ++ --enable-intel_gige enable driver intel_gige ++ --enable-natsemi enable driver alias natsemi ++ --enable-natsemi enable driver natsemi + --enable-myson803 enable driver alias myson803 + --enable-myson803 enable driver myson803 + --enable-ns820 enable driver alias ns820 @@ -9693,7 +9703,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +echo >confdefs.h + +# Predefined preprocessor variables. - ++ +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF @@ -9702,7 +9712,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF -+ + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" @@ -9723,7 +9733,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then if test "x$prefix" != xNONE; then -@@ -852,39 +1342,94 @@ +@@ -852,39 +1348,100 @@ fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -9838,19 +9848,19 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + + + - - - -@@ -912,6 +1457,21 @@ - - - + + + + + + + + + +@@ -912,6 +1469,15 @@ + + + + + + @@ -9863,7 +9873,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then -@@ -929,95 +1489,133 @@ +@@ -929,385 +1495,1223 @@ fi done if test -z "$ac_aux_dir"; then @@ -9932,9 +9942,9 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ -echo "$ac_t""$ac_cv_host" 1>&6 + +echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6 +if test "${ac_cv_host+set}" = set; then @@ -9947,7 +9957,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } - ++ +fi +echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6 @@ -9970,13 +9980,13 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu -#define CONFIG_M386 1 -EOF +i386) -+ + +- cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF +#define CONFIG_M386 +_ACEOF + - -- cat >> confdefs.h <<\EOF ++ +cat >>confdefs.h <<\_ACEOF #define CPU 386 -EOF @@ -9985,103 +9995,155 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu -#define CONFIG_M486 1 -EOF +_ACEOF -+ -+ ;; -+i486) -+ -+cat >>confdefs.h <<\_ACEOF -+#define CONFIG_M486 -+_ACEOF -+ - cat >> confdefs.h <<\EOF -+cat >>confdefs.h <<\_ACEOF - #define CPU 486 +-#define CPU 486 -EOF - ;; -i586) cat >> confdefs.h <<\EOF -#define CONFIG_M586 1 -EOF -+_ACEOF -+ + ;; -+i586) -+ -+cat >>confdefs.h <<\_ACEOF -+#define CONFIG_M586 -+_ACEOF -+ ++i486) - cat >> confdefs.h <<\EOF -+cat >>confdefs.h <<\_ACEOF - #define CPU 586 +-#define CPU 586 -EOF - ;; -i686) cat >> confdefs.h <<\EOF -#define CONFIG_M686 1 -EOF -+_ACEOF -+ -+ ;; -+i686) -+ +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_M686 ++#define CONFIG_M486 +_ACEOF -+ - cat >> confdefs.h <<\EOF -+cat >>confdefs.h <<\_ACEOF - #define CPU 686 +-#define CPU 686 -EOF - ;; -*) cat >> confdefs.h <<\EOF -#define CONFIG_M486 1 -EOF -+_ACEOF -+ -+ ;; -+*) -+ -+cat >>confdefs.h <<\_ACEOF -+#define CONFIG_M486 -+_ACEOF - cat >> confdefs.h <<\EOF -+ +cat >>confdefs.h <<\_ACEOF #define CPU 486 -EOF - ;; +-esac +- +-case "$host_cpu" in +-i[3456]86) systype=i386 ;; +-*) systype="$host_cpu" ;; +-esac +_ACEOF -+ -+ ;; - esac - case "$host_cpu" in -@@ -1026,288 +1624,1088 @@ - esac ++ ;; ++i586) ++cat >>confdefs.h <<\_ACEOF ++#define CONFIG_M586 ++_ACEOF -- -echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1032: checking build system type" >&5 -if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then -- + -# Make sure we can run config.sub. - if $ac_config_sub sun4 >/dev/null 2>&1; then : - else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +- fi ++cat >>confdefs.h <<\_ACEOF ++#define CPU 586 ++_ACEOF + +- ac_cv_build_alias=$build +- case "$ac_cv_build_alias" in +- NONE) +- case $nonopt in +- NONE) +- ac_cv_build_alias=$host_alias ;; ++ ;; ++i686) + +- *) ac_cv_build_alias=$nonopt ;; +- esac ;; +- esac ++cat >>confdefs.h <<\_ACEOF ++#define CONFIG_M686 ++_ACEOF + +- ac_cv_build=`$ac_config_sub $ac_cv_build_alias` +- ac_cv_build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +- ac_cv_build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +- ac_cv_build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +-else +- echo $ac_n "(cached) $ac_c" 1>&6 +-fi + +-echo "$ac_t""$ac_cv_build" 1>&6 ++cat >>confdefs.h <<\_ACEOF ++#define CPU 686 ++_ACEOF + +-build=$ac_cv_build +-build_alias=$ac_cv_build_alias +-build_cpu=$ac_cv_build_cpu +-build_vendor=$ac_cv_build_vendor +-build_os=$ac_cv_build_os ++ ;; ++*) + ++cat >>confdefs.h <<\_ACEOF ++#define CONFIG_M486 ++_ACEOF + + ++cat >>confdefs.h <<\_ACEOF ++#define CPU 486 ++_ACEOF + +-if test $host != $build; then +- ac_tool_prefix=${host_alias}- +-else +- ac_tool_prefix= +-fi ++ ;; ++esac + +-# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. ++case "$host_cpu" in ++i[3456]86) systype=i386 ;; ++*) systype="$host_cpu" ;; ++esac ++ ++ +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -+set dummy ${ac_tool_prefix}gcc; ac_word=$2 + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1079: checking for $ac_word" >&5 +-if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_CC="${ac_tool_prefix}gcc" +- break +- fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="gcc" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do @@ -10092,46 +10154,24 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 - fi ++ fi +done +done - -- ac_cv_build_alias=$build -- case "$ac_cv_build_alias" in -- NONE) -- case $nonopt in -- NONE) -- ac_cv_build_alias=$host_alias ;; -- -- *) ac_cv_build_alias=$nonopt ;; -- esac ;; -- esac -- -- ac_cv_build=`$ac_config_sub $ac_cv_build_alias` -- ac_cv_build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -- ac_cv_build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -- ac_cv_build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+fi -+fi ++ + fi + fi +-CC="$ac_cv_prog_CC" +CC=$ac_cv_prog_CC -+if test -n "$CC"; then + if test -n "$CC"; then +- echo "$ac_t""$CC" 1>&6 + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else -- echo $ac_n "(cached) $ac_c" 1>&6 +- echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi --echo "$ac_t""$ac_cv_build" 1>&6 -- --build=$ac_cv_build --build_alias=$ac_cv_build_alias --build_cpu=$ac_cv_build_cpu --build_vendor=$ac_cv_build_vendor --build_os=$ac_cv_build_os -- -- +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC @@ -10170,15 +10210,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +echo "${ECHO_T}no" >&6 +fi --if test $host != $build; then -- ac_tool_prefix=${host_alias}- +-# Extract the first word of "gcc", so it can be a program name with args. + CC=$ac_ct_CC - else -- ac_tool_prefix= ++else + CC="$ac_cv_prog_CC" - fi - --# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. ++fi ++ +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -10186,30 +10223,15 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1079: checking for $ac_word" >&5 --if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 ++set dummy ${ac_tool_prefix}gcc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- ac_cv_prog_CC="${ac_tool_prefix}gcc" -- break -- fi -- done -- IFS="$ac_save_ifs" -- test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="gcc" ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do @@ -10224,25 +10246,26 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +done +done + - fi - fi --CC="$ac_cv_prog_CC" ++fi ++fi +CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$ac_t""$CC" 1>&6 ++if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 - else -- echo "$ac_t""no" 1>&6 ++else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 - fi - ++fi ++ +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. -+set dummy gcc; ac_word=$2 + set dummy gcc; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1111: checking for $ac_word" >&5 +-if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then @@ -10264,7 +10287,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + fi +done +done - ++ +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC @@ -10275,13 +10298,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi - --# Extract the first word of "gcc", so it can be a program name with args. --set dummy gcc; ac_word=$2 --echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1111: checking for $ac_word" >&5 --if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 ++ + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" @@ -10602,13 +10619,13 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu - ac_cv_prog_gcc=no + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 - fi ++fi + + test -n "$ac_ct_CC" && break +done + + CC=$ac_ct_CC -+fi + fi + fi @@ -10808,8 +10825,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- GCC= ++else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF @@ -10905,10 +10921,10 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_compiler_gnu=no - fi ++fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu - ++ +fi +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 @@ -10961,8 +10977,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - --# Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. ++ +ac_cv_prog_cc_g=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext @@ -10988,7 +11003,8 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- GCC= + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF @@ -11080,7 +11096,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + -+fi + fi +rm -f conftest.err conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext @@ -11243,8 +11259,9 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ + + +-# Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 @@ -11293,11 +11310,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu - echo "$ac_t""$LD" 1>&6 + echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6 -+else + else +- echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 -+fi -+ + fi + +fi +if test -z "$ac_cv_prog_LD"; then + ac_ct_LD=$LD @@ -11331,12 +11349,11 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +if test -n "$ac_ct_LD"; then + echo "$as_me:$LINENO: result: $ac_ct_LD" >&5 +echo "${ECHO_T}$ac_ct_LD" >&6 - else -- echo "$ac_t""no" 1>&6 ++else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 - fi - ++fi ++ + LD=$ac_ct_LD +else + LD="$ac_cv_prog_LD" @@ -11344,7 +11361,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu -@@ -1320,8 +2718,7 @@ +@@ -1320,8 +2724,7 @@ enableval="$enable_3c501" enable_el1="$enable_3c501" @@ -11354,7 +11371,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c503 # Check whether --enable-3c503 or --disable-3c503 was given. -@@ -1329,8 +2726,7 @@ +@@ -1329,8 +2732,7 @@ enableval="$enable_3c503" enable_el2="$enable_3c503" @@ -11364,7 +11381,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c509 # Check whether --enable-3c509 or --disable-3c509 was given. -@@ -1338,8 +2734,7 @@ +@@ -1338,8 +2740,7 @@ enableval="$enable_3c509" enable_el3="$enable_3c509" @@ -11374,7 +11391,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c579 # Check whether --enable-3c579 or --disable-3c579 was given. -@@ -1347,8 +2742,7 @@ +@@ -1347,8 +2748,7 @@ enableval="$enable_3c579" enable_el3="$enable_3c579" @@ -11384,7 +11401,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c59x # Check whether --enable-3c59x or --disable-3c59x was given. -@@ -1356,8 +2750,7 @@ +@@ -1356,8 +2756,7 @@ enableval="$enable_3c59x" enable_vortex="$enable_3c59x" @@ -11394,7 +11411,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c90x # Check whether --enable-3c90x or --disable-3c90x was given. -@@ -1365,8 +2758,7 @@ +@@ -1365,8 +2764,7 @@ enableval="$enable_3c90x" enable_vortex="$enable_3c90x" @@ -11404,7 +11421,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias hpj2577 # Check whether --enable-hpj2577 or --disable-hpj2577 was given. -@@ -1374,8 +2766,7 @@ +@@ -1374,8 +2772,7 @@ enableval="$enable_hpj2577" enable_hp100="$enable_hpj2577" @@ -11414,7 +11431,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias hpj2573 # Check whether --enable-hpj2573 or --disable-hpj2573 was given. -@@ -1383,8 +2774,7 @@ +@@ -1383,8 +2780,7 @@ enableval="$enable_hpj2573" enable_hp100="$enable_hpj2573" @@ -11424,7 +11441,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias hpj2585 # Check whether --enable-hpj2585 or --disable-hpj2585 was given. -@@ -1392,8 +2782,7 @@ +@@ -1392,8 +2788,7 @@ enableval="$enable_hpj2585" enable_hp100="$enable_hpj2585" @@ -11434,7 +11451,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias hp27248b # Check whether --enable-hp27248b or --disable-hp27248b was given. -@@ -1401,8 +2790,7 @@ +@@ -1401,8 +2796,7 @@ enableval="$enable_hp27248b" enable_hp100="$enable_hp27248b" @@ -11444,7 +11461,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias eth32 # Check whether --enable-eth32 or --disable-eth32 was given. -@@ -1410,8 +2798,7 @@ +@@ -1410,8 +2804,7 @@ enableval="$enable_eth32" enable_eth16i="$enable_eth32" @@ -11454,7 +11471,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias znote # Check whether --enable-znote or --disable-znote was given. -@@ -1419,8 +2806,7 @@ +@@ -1419,8 +2812,7 @@ enableval="$enable_znote" enable_znet="$enable_znote" @@ -11464,7 +11481,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de100 # Check whether --enable-de100 or --disable-de100 was given. -@@ -1428,8 +2814,7 @@ +@@ -1428,8 +2820,7 @@ enableval="$enable_de100" enable_depca="$enable_de100" @@ -11474,7 +11491,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de101 # Check whether --enable-de101 or --disable-de101 was given. -@@ -1437,8 +2822,7 @@ +@@ -1437,8 +2828,7 @@ enableval="$enable_de101" enable_depca="$enable_de101" @@ -11484,7 +11501,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de200 # Check whether --enable-de200 or --disable-de200 was given. -@@ -1446,8 +2830,7 @@ +@@ -1446,8 +2836,7 @@ enableval="$enable_de200" enable_depca="$enable_de200" @@ -11494,7 +11511,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de201 # Check whether --enable-de201 or --disable-de201 was given. -@@ -1455,8 +2838,7 @@ +@@ -1455,8 +2844,7 @@ enableval="$enable_de201" enable_depca="$enable_de201" @@ -11504,7 +11521,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de202 # Check whether --enable-de202 or --disable-de202 was given. -@@ -1464,8 +2846,7 @@ +@@ -1464,8 +2852,7 @@ enableval="$enable_de202" enable_depca="$enable_de202" @@ -11514,7 +11531,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de210 # Check whether --enable-de210 or --disable-de210 was given. -@@ -1473,8 +2854,7 @@ +@@ -1473,8 +2860,7 @@ enableval="$enable_de210" enable_depca="$enable_de210" @@ -11524,7 +11541,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de422 # Check whether --enable-de422 or --disable-de422 was given. -@@ -1482,8 +2862,7 @@ +@@ -1482,8 +2868,7 @@ enableval="$enable_de422" enable_depca="$enable_de422" @@ -11534,7 +11551,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de203 # Check whether --enable-de203 or --disable-de203 was given. -@@ -1491,8 +2870,7 @@ +@@ -1491,8 +2876,7 @@ enableval="$enable_de203" enable_ewrk3="$enable_de203" @@ -11544,7 +11561,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de204 # Check whether --enable-de204 or --disable-de204 was given. -@@ -1500,8 +2878,7 @@ +@@ -1500,8 +2884,7 @@ enableval="$enable_de204" enable_ewrk3="$enable_de204" @@ -11554,7 +11571,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de205 # Check whether --enable-de205 or --disable-de205 was given. -@@ -1509,8 +2886,7 @@ +@@ -1509,8 +2892,7 @@ enableval="$enable_de205" enable_ewrk3="$enable_de205" @@ -11564,7 +11581,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de425 # Check whether --enable-de425 or --disable-de425 was given. -@@ -1518,8 +2894,7 @@ +@@ -1518,8 +2900,7 @@ enableval="$enable_de425" enable_de4x5="$enable_de425" @@ -11574,7 +11591,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de434 # Check whether --enable-de434 or --disable-de434 was given. -@@ -1527,8 +2902,7 @@ +@@ -1527,8 +2908,7 @@ enableval="$enable_de434" enable_de4x5="$enable_de434" @@ -11584,7 +11601,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de435 # Check whether --enable-de435 or --disable-de435 was given. -@@ -1536,8 +2910,7 @@ +@@ -1536,8 +2916,7 @@ enableval="$enable_de435" enable_de4x5="$enable_de435" @@ -11594,7 +11611,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de450 # Check whether --enable-de450 or --disable-de450 was given. -@@ -1545,8 +2918,7 @@ +@@ -1545,8 +2924,7 @@ enableval="$enable_de450" enable_de4x5="$enable_de450" @@ -11604,7 +11621,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de500 # Check whether --enable-de500 or --disable-de500 was given. -@@ -1554,8 +2926,7 @@ +@@ -1554,8 +2932,7 @@ enableval="$enable_de500" enable_de4x5="$enable_de500" @@ -11614,7 +11631,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c507 # Check whether --enable-3c507 or --disable-3c507 was given. -@@ -1563,8 +2934,7 @@ +@@ -1563,8 +2940,7 @@ enableval="$enable_3c507" enable_el16="$enable_3c507" @@ -11624,7 +11641,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c505 # Check whether --enable-3c505 or --disable-3c505 was given. -@@ -1572,8 +2942,7 @@ +@@ -1572,8 +2948,7 @@ enableval="$enable_3c505" enable_elplus="$enable_3c505" @@ -11634,7 +11651,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ne1000 # Check whether --enable-ne1000 or --disable-ne1000 was given. -@@ -1581,8 +2950,7 @@ +@@ -1581,8 +2956,7 @@ enableval="$enable_ne1000" enable_ne2000="$enable_ne1000" @@ -11644,7 +11661,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ne # Check whether --enable-ne or --disable-ne was given. -@@ -1590,8 +2958,7 @@ +@@ -1590,8 +2964,7 @@ enableval="$enable_ne" enable_ne2000="$enable_ne" @@ -11654,7 +11671,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias at1500 # Check whether --enable-at1500 or --disable-at1500 was given. -@@ -1599,8 +2966,7 @@ +@@ -1599,8 +2972,7 @@ enableval="$enable_at1500" enable_lance="$enable_at1500" @@ -11664,7 +11681,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ne2100 # Check whether --enable-ne2100 or --disable-ne2100 was given. -@@ -1608,8 +2974,7 @@ +@@ -1608,8 +2980,7 @@ enableval="$enable_ne2100" enable_lance="$enable_ne2100" @@ -11674,7 +11691,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias tulip # Check whether --enable-tulip or --disable-tulip was given. -@@ -1617,8 +2982,7 @@ +@@ -1617,8 +2988,7 @@ enableval="$enable_tulip" enable_elcp="$enable_tulip" @@ -11684,7 +11701,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias rtl8129 # Check whether --enable-rtl8129 or --disable-rtl8129 was given. -@@ -1626,8 +2990,7 @@ +@@ -1626,8 +2996,7 @@ enableval="$enable_rtl8129" enable_rtl8139="$enable_rtl8129" @@ -11694,7 +11711,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias aha2825 # Check whether --enable-aha2825 or --disable-aha2825 was given. -@@ -1635,8 +2998,7 @@ +@@ -1635,8 +3004,7 @@ enableval="$enable_aha2825" enable_aha152x="$enable_aha2825" @@ -11704,7 +11721,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ncr53c400 # Check whether --enable-ncr53c400 or --disable-ncr53c400 was given. -@@ -1644,8 +3006,7 @@ +@@ -1644,8 +3012,7 @@ enableval="$enable_ncr53c400" enable_ncr5380="$enable_ncr53c400" @@ -11714,7 +11731,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias t128f # Check whether --enable-t128f or --disable-t128f was given. -@@ -1653,8 +3014,7 @@ +@@ -1653,8 +3020,7 @@ enableval="$enable_t128f" enable_t128="$enable_t128f" @@ -11724,7 +11741,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias t228 # Check whether --enable-t228 or --disable-t228 was given. -@@ -1662,8 +3022,7 @@ +@@ -1662,8 +3028,7 @@ enableval="$enable_t228" enable_t128="$enable_t228" @@ -11734,7 +11751,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias am79c974 # Check whether --enable-am79c974 or --disable-am79c974 was given. -@@ -1671,8 +3030,7 @@ +@@ -1671,8 +3036,7 @@ enableval="$enable_am79c974" enable_am53c974="$enable_am79c974" @@ -11744,7 +11761,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias dtc3180 # Check whether --enable-dtc3180 or --disable-dtc3180 was given. -@@ -1680,8 +3038,7 @@ +@@ -1680,8 +3044,7 @@ enableval="$enable_dtc3180" enable_dtc3280="$enable_dtc3180" @@ -11754,7 +11771,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias dc390w # Check whether --enable-dc390w or --disable-dc390w was given. -@@ -1689,8 +3046,7 @@ +@@ -1689,8 +3052,7 @@ enableval="$enable_dc390w" enable_ncr53c8xx="$enable_dc390w" @@ -11764,7 +11781,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias dc390u # Check whether --enable-dc390u or --disable-dc390u was given. -@@ -1698,8 +3054,7 @@ +@@ -1698,8 +3060,7 @@ enableval="$enable_dc390u" enable_ncr53c8xx="$enable_dc390u" @@ -11774,7 +11791,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias dc390f # Check whether --enable-dc390f or --disable-dc390f was given. -@@ -1707,8 +3062,7 @@ +@@ -1707,8 +3068,7 @@ enableval="$enable_dc390f" enable_ncr53c8xx="$enable_dc390f" @@ -11784,7 +11801,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias dc390 # Check whether --enable-dc390 or --disable-dc390 was given. -@@ -1716,8 +3070,7 @@ +@@ -1716,8 +3076,7 @@ enableval="$enable_dc390" enable_dc390t="$enable_dc390" @@ -11794,13 +11811,14 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias epic100 # Check whether --enable-epic100 or --disable-epic100 was given. -@@ -1725,19 +3078,21 @@ +@@ -1725,19 +3084,25 @@ enableval="$enable_epic100" enable_epic="$enable_epic100" -fi -- +fi; ++ + @@ -11810,29 +11828,30 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +driver_class_scsi_files=" \ + constants.o hosts.o scsi.o scsi_ioctl.o scsi_proc.o scsicam.o sd.o \ + sd_ioctl.o sr.o sr_ioctl.o" ++ ++ driver_class_net_option=CONFIG_INET -driver_class_net_files="auto_irq.o net.o Space.o dev.o net_init.o" +driver_class_net_files=" \ -+ auto_irq.o net.o Space.o dev.o net_init.o pci-scan.o pci-skeleton.o" ++ auto_irq.o net.o Space.o dev.o net_init.o pci-scan.o" -@@ -1749,46 +3104,61 @@ +@@ -1749,46 +3114,61 @@ # Check whether --enable-floppy or --disable-floppy was given. if test "${enable_floppy+set}" = set; then enableval="$enable_floppy" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_BLK_DEV_FD 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_BLK_DEV_FD + #define CONFIG_BLK_DEV_FD 1 +-EOF +_ACEOF device_drivers="$device_drivers floppy.o" @@ -11858,16 +11877,15 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_ide" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_BLK_DEV_IDE 1 --EOF - --device_drivers="$device_drivers cmd640.o ide-cd.o ide.o rz1000.o triton.o" ++ +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_BLK_DEV_IDE + #define CONFIG_BLK_DEV_IDE 1 +-EOF +_ACEOF -+ + +-device_drivers="$device_drivers cmd640.o ide-cd.o ide.o rz1000.o triton.o" +device_drivers="$device_drivers \ + cmd640.o ide-cd.o ide.o rz1000.o triton.o" if test "${driver_class__selected+set}" != set; then @@ -11885,20 +11903,20 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu -fi +fi; + -+# Check whether --enable-forcedma or --disable-forcedma was given. -+if test "${enable_forcedma+set}" = set; then -+ enableval="$enable_forcedma" ++# Check whether --enable-ide-forcedma or --disable-ide-forcedma was given. ++if test "${enable_ide_forcedma+set}" = set; then ++ enableval="$enable_ide_forcedma" + test x"$enableval" = xno && + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_BLK_DEV_FORCE_DMA ++#define CONFIG_BLK_DEV_FORCE_DMA 1 +_ACEOF + +fi; -@@ -1800,30 +3170,32 @@ +@@ -1800,30 +3180,32 @@ enableval="$enable_advansys" enable_advansys="$enable_advansys" @@ -11912,13 +11930,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_advansys" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_ADVANSYS 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_ADVANSYS + #define CONFIG_SCSI_ADVANSYS 1 +-EOF +_ACEOF device_drivers="$device_drivers advansys.o" @@ -11940,7 +11957,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias BusLogic -@@ -1832,30 +3204,32 @@ +@@ -1832,30 +3214,32 @@ enableval="$enable_BusLogic" enable_buslogic="$enable_BusLogic" @@ -11954,13 +11971,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_buslogic" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_BUSLOGIC 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_BUSLOGIC + #define CONFIG_SCSI_BUSLOGIC 1 +-EOF +_ACEOF device_drivers="$device_drivers BusLogic.o" @@ -11982,7 +11998,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias u14-34f -@@ -1864,30 +3238,32 @@ +@@ -1864,30 +3248,32 @@ enableval="$enable_u14_34f" enable_u1434f="$enable_u14-34f" @@ -11996,13 +12012,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_u1434f" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_U14_34F 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_U14_34F + #define CONFIG_SCSI_U14_34F 1 +-EOF +_ACEOF device_drivers="$device_drivers u14-34f.o" @@ -12024,7 +12039,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ultrastor -@@ -1896,30 +3272,32 @@ +@@ -1896,30 +3282,32 @@ enableval="$enable_ultrastor" enable_ultrastor="$enable_ultrastor" @@ -12038,13 +12053,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_ultrastor" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_ULTRASTOR 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_ULTRASTOR + #define CONFIG_SCSI_ULTRASTOR 1 +-EOF +_ACEOF device_drivers="$device_drivers ultrastor.o" @@ -12066,7 +12080,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias aha152x -@@ -1928,30 +3306,32 @@ +@@ -1928,30 +3316,32 @@ enableval="$enable_aha152x" enable_aha152x="$enable_aha152x" @@ -12080,13 +12094,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_aha152x" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_AHA152X 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_AHA152X + #define CONFIG_SCSI_AHA152X 1 +-EOF +_ACEOF device_drivers="$device_drivers aha152x.o" @@ -12108,7 +12121,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias aha1542 -@@ -1960,30 +3340,32 @@ +@@ -1960,30 +3350,32 @@ enableval="$enable_aha1542" enable_aha1542="$enable_aha1542" @@ -12122,13 +12135,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_aha1542" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_AHA1542 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_AHA1542 + #define CONFIG_SCSI_AHA1542 1 +-EOF +_ACEOF device_drivers="$device_drivers aha1542.o" @@ -12150,7 +12162,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias aha1740 -@@ -1992,30 +3374,32 @@ +@@ -1992,30 +3384,32 @@ enableval="$enable_aha1740" enable_aha1740="$enable_aha1740" @@ -12164,13 +12176,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_aha1740" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_AHA1740 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_AHA1740 + #define CONFIG_SCSI_AHA1740 1 +-EOF +_ACEOF device_drivers="$device_drivers aha1740.o" @@ -12192,7 +12203,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias aic7xxx -@@ -2024,30 +3408,32 @@ +@@ -2024,30 +3418,32 @@ enableval="$enable_aic7xxx" enable_aic7xxx="$enable_aic7xxx" @@ -12206,13 +12217,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_aic7xxx" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_AIC7XXX 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_AIC7XXX + #define CONFIG_SCSI_AIC7XXX 1 +-EOF +_ACEOF device_drivers="$device_drivers aic7xxx.o" @@ -12234,7 +12244,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias fdomain -@@ -2056,30 +3442,32 @@ +@@ -2056,30 +3452,32 @@ enableval="$enable_fdomain" enable_futuredomain="$enable_fdomain" @@ -12248,13 +12258,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_futuredomain" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_FUTURE_DOMAIN 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_FUTURE_DOMAIN + #define CONFIG_SCSI_FUTURE_DOMAIN 1 +-EOF +_ACEOF device_drivers="$device_drivers fdomain.o" @@ -12276,7 +12285,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias in2000 -@@ -2088,30 +3476,32 @@ +@@ -2088,30 +3486,32 @@ enableval="$enable_in2000" enable_in2000="$enable_in2000" @@ -12290,13 +12299,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_in2000" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_IN2000 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_IN2000 + #define CONFIG_SCSI_IN2000 1 +-EOF +_ACEOF device_drivers="$device_drivers in2000.o" @@ -12318,7 +12326,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias g_NCR5380 -@@ -2120,30 +3510,32 @@ +@@ -2120,30 +3520,32 @@ enableval="$enable_g_NCR5380" enable_ncr5380="$enable_g_NCR5380" @@ -12332,13 +12340,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_ncr5380" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_GENERIC_NCR5380 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_GENERIC_NCR5380 + #define CONFIG_SCSI_GENERIC_NCR5380 1 +-EOF +_ACEOF device_drivers="$device_drivers g_NCR5380.o" @@ -12360,7 +12367,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias NCR53c406a -@@ -2152,30 +3544,32 @@ +@@ -2152,30 +3554,32 @@ enableval="$enable_NCR53c406a" enable_ncr53c406a="$enable_NCR53c406a" @@ -12374,13 +12381,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_ncr53c406a" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_NCR53C406A 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_NCR53C406A + #define CONFIG_SCSI_NCR53C406A 1 +-EOF +_ACEOF device_drivers="$device_drivers NCR53c406a.o" @@ -12402,7 +12408,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias pas16 -@@ -2184,30 +3578,32 @@ +@@ -2184,30 +3588,32 @@ enableval="$enable_pas16" enable_pas16="$enable_pas16" @@ -12416,13 +12422,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_pas16" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_PASS16 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_PASS16 + #define CONFIG_SCSI_PASS16 1 +-EOF +_ACEOF device_drivers="$device_drivers pas16.o" @@ -12444,7 +12449,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias seagate -@@ -2216,30 +3612,32 @@ +@@ -2216,30 +3622,32 @@ enableval="$enable_seagate" enable_seagate="$enable_seagate" @@ -12458,13 +12463,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_seagate" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_SEAGATE 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_SEAGATE + #define CONFIG_SCSI_SEAGATE 1 +-EOF +_ACEOF device_drivers="$device_drivers seagate.o" @@ -12486,7 +12490,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias t128 -@@ -2248,30 +3646,32 @@ +@@ -2248,30 +3656,32 @@ enableval="$enable_t128" enable_t128="$enable_t128" @@ -12500,13 +12504,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_t128" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_T128 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_T128 + #define CONFIG_SCSI_T128 1 +-EOF +_ACEOF device_drivers="$device_drivers t128.o" @@ -12528,7 +12531,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 53c78xx -@@ -2280,30 +3680,32 @@ +@@ -2280,30 +3690,32 @@ enableval="$enable_53c78xx" enable_ncr53c7xx="$enable_53c78xx" @@ -12542,13 +12545,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_ncr53c7xx" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_NCR53C7xx 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_NCR53C7xx + #define CONFIG_SCSI_NCR53C7xx 1 +-EOF +_ACEOF device_drivers="$device_drivers 53c78xx.o" @@ -12570,7 +12572,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias eata_dma -@@ -2312,30 +3714,32 @@ +@@ -2312,30 +3724,32 @@ enableval="$enable_eata_dma" enable_eatadma="$enable_eata_dma" @@ -12584,13 +12586,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_eatadma" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_EATA_DMA 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_EATA_DMA + #define CONFIG_SCSI_EATA_DMA 1 +-EOF +_ACEOF device_drivers="$device_drivers eata_dma.o" @@ -12612,7 +12613,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias eata_pio -@@ -2344,30 +3748,32 @@ +@@ -2344,30 +3758,32 @@ enableval="$enable_eata_pio" enable_eatapio="$enable_eata_pio" @@ -12626,13 +12627,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_eatapio" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_EATA_PIO 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_EATA_PIO + #define CONFIG_SCSI_EATA_PIO 1 +-EOF +_ACEOF device_drivers="$device_drivers eata_pio.o" @@ -12654,7 +12654,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias wd7000 -@@ -2376,30 +3782,32 @@ +@@ -2376,30 +3792,32 @@ enableval="$enable_wd7000" enable_wd7000="$enable_wd7000" @@ -12668,13 +12668,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_wd7000" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_7000FASST 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_7000FASST + #define CONFIG_SCSI_7000FASST 1 +-EOF +_ACEOF device_drivers="$device_drivers wd7000.o" @@ -12696,7 +12695,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias eata -@@ -2408,30 +3816,32 @@ +@@ -2408,30 +3826,32 @@ enableval="$enable_eata" enable_eata="$enable_eata" @@ -12710,13 +12709,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_eata" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_EATA 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_EATA + #define CONFIG_SCSI_EATA 1 +-EOF +_ACEOF device_drivers="$device_drivers eata.o" @@ -12738,7 +12736,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias AM53C974 -@@ -2440,30 +3850,32 @@ +@@ -2440,30 +3860,32 @@ enableval="$enable_AM53C974" enable_am53c974="$enable_AM53C974" @@ -12752,13 +12750,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_am53c974" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_AM53C974 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_AM53C974 + #define CONFIG_SCSI_AM53C974 1 +-EOF +_ACEOF device_drivers="$device_drivers AM53C974.o" @@ -12780,7 +12777,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias dtc -@@ -2472,30 +3884,32 @@ +@@ -2472,30 +3894,32 @@ enableval="$enable_dtc" enable_dtc3280="$enable_dtc" @@ -12794,13 +12791,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_dtc3280" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_DTC3280 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_DTC3280 + #define CONFIG_SCSI_DTC3280 1 +-EOF +_ACEOF device_drivers="$device_drivers dtc.o" @@ -12822,7 +12818,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ncr53c8xx -@@ -2504,30 +3918,32 @@ +@@ -2504,30 +3928,32 @@ enableval="$enable_ncr53c8xx" enable_ncr53c8xx="$enable_ncr53c8xx" @@ -12836,13 +12832,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_ncr53c8xx" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_NCR53C8XX 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_NCR53C8XX + #define CONFIG_SCSI_NCR53C8XX 1 +-EOF +_ACEOF device_drivers="$device_drivers ncr53c8xx.o" @@ -12864,7 +12859,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias tmscsim -@@ -2536,30 +3952,32 @@ +@@ -2536,174 +3962,454 @@ enableval="$enable_tmscsim" enable_dc390t="$enable_tmscsim" @@ -12878,13 +12873,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_dc390t" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_DC390T 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_DC390T + #define CONFIG_SCSI_DC390T 1 +-EOF +_ACEOF device_drivers="$device_drivers tmscsim.o" @@ -12892,175 +12886,141 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu driver_class_scsi_selected=yes - cat >> confdefs.h <<EOF + cat >>confdefs.h <<_ACEOF - #define $driver_class_scsi_option 1 --EOF ++#define $driver_class_scsi_option 1 +_ACEOF - - device_drivers="$device_drivers $driver_class_scsi_files" - fi - fi - --fi ++ ++ device_drivers="$device_drivers $driver_class_scsi_files" ++fi ++fi ++ +fi; + - - - # Checking for alias ppa -@@ -2568,62 +3986,66 @@ - enableval="$enable_ppa" - enable_ppa="$enable_ppa" - --fi -- ++ ++ ++# Checking for alias ppa ++# Check whether --enable-ppa or --disable-ppa was given. ++if test "${enable_ppa+set}" = set; then ++ enableval="$enable_ppa" ++ enable_ppa="$enable_ppa" ++ +fi; - - # Checking for device driver option ppa - # Check whether --enable-ppa or --disable-ppa was given. - if test "${enable_ppa+set}" = set; then - enableval="$enable_ppa" -- if test "x$enableval" != xno; then --cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_PPA 1 --EOF ++ ++# Checking for device driver option ppa ++# Check whether --enable-ppa or --disable-ppa was given. ++if test "${enable_ppa+set}" = set; then ++ enableval="$enable_ppa" + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_PPA ++#define CONFIG_SCSI_PPA 1 +_ACEOF - - device_drivers="$device_drivers ppa.o" - if test "${driver_class_scsi_selected+set}" != set; then - driver_class_scsi_selected=yes -- cat >> confdefs.h <<EOF ++ ++device_drivers="$device_drivers ppa.o" ++if test "${driver_class_scsi_selected+set}" != set; then ++ driver_class_scsi_selected=yes + cat >>confdefs.h <<_ACEOF - #define $driver_class_scsi_option 1 --EOF ++#define $driver_class_scsi_option 1 +_ACEOF - - device_drivers="$device_drivers $driver_class_scsi_files" - fi - fi - --fi ++ ++ device_drivers="$device_drivers $driver_class_scsi_files" ++fi ++fi ++ +fi; + - - - # Checking for alias qlogicfas - # Check whether --enable-qlogicfas or --disable-qlogicfas was given. - if test "${enable_qlogicfas+set}" = set; then - enableval="$enable_qlogicfas" -- enable_qlogicfas="$enable_qlogicfas" -- --fi ++ ++ ++# Checking for alias qlogicfas ++# Check whether --enable-qlogicfas or --disable-qlogicfas was given. ++if test "${enable_qlogicfas+set}" = set; then ++ enableval="$enable_qlogicfas" + enable_qlogicfas="$enable_qlogicfas" - ++ +fi; - - # Checking for device driver option qlogicfas - # Check whether --enable-qlogicfas or --disable-qlogicfas was given. - if test "${enable_qlogicfas+set}" = set; then - enableval="$enable_qlogicfas" -- if test "x$enableval" != xno; then --cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_QLOGIC_FAS 1 --EOF ++ ++# Checking for device driver option qlogicfas ++# Check whether --enable-qlogicfas or --disable-qlogicfas was given. ++if test "${enable_qlogicfas+set}" = set; then ++ enableval="$enable_qlogicfas" + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_QLOGIC_FAS ++#define CONFIG_SCSI_QLOGIC_FAS 1 +_ACEOF - - device_drivers="$device_drivers qlogicfas.o" - if test "${driver_class_scsi_selected+set}" != set; then - driver_class_scsi_selected=yes -- cat >> confdefs.h <<EOF ++ ++device_drivers="$device_drivers qlogicfas.o" ++if test "${driver_class_scsi_selected+set}" != set; then ++ driver_class_scsi_selected=yes + cat >>confdefs.h <<_ACEOF - #define $driver_class_scsi_option 1 --EOF ++#define $driver_class_scsi_option 1 +_ACEOF - - device_drivers="$device_drivers $driver_class_scsi_files" - fi - fi - --fi ++ ++ device_drivers="$device_drivers $driver_class_scsi_files" ++fi ++fi ++ +fi; + - - - # Checking for alias qlogicisp -@@ -2632,30 +4054,32 @@ - enableval="$enable_qlogicisp" - enable_qlogicisp="$enable_qlogicisp" - --fi -- ++ ++ ++# Checking for alias qlogicisp ++# Check whether --enable-qlogicisp or --disable-qlogicisp was given. ++if test "${enable_qlogicisp+set}" = set; then ++ enableval="$enable_qlogicisp" ++ enable_qlogicisp="$enable_qlogicisp" ++ +fi; - - # Checking for device driver option qlogicisp - # Check whether --enable-qlogicisp or --disable-qlogicisp was given. - if test "${enable_qlogicisp+set}" = set; then - enableval="$enable_qlogicisp" -- if test "x$enableval" != xno; then --cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_QLOGIC_ISP 1 --EOF ++ ++# Checking for device driver option qlogicisp ++# Check whether --enable-qlogicisp or --disable-qlogicisp was given. ++if test "${enable_qlogicisp+set}" = set; then ++ enableval="$enable_qlogicisp" + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_QLOGIC_ISP ++#define CONFIG_SCSI_QLOGIC_ISP 1 +_ACEOF - - device_drivers="$device_drivers qlogicisp.o" - if test "${driver_class_scsi_selected+set}" != set; then - driver_class_scsi_selected=yes -- cat >> confdefs.h <<EOF ++ ++device_drivers="$device_drivers qlogicisp.o" ++if test "${driver_class_scsi_selected+set}" != set; then ++ driver_class_scsi_selected=yes + cat >>confdefs.h <<_ACEOF - #define $driver_class_scsi_option 1 --EOF ++#define $driver_class_scsi_option 1 +_ACEOF - - device_drivers="$device_drivers $driver_class_scsi_files" - fi - fi - --fi ++ ++ device_drivers="$device_drivers $driver_class_scsi_files" ++fi ++fi ++ +fi; + - - - # Checking for alias gdth -@@ -2664,46 +4088,219 @@ - enableval="$enable_gdth" - enable_gdth="$enable_gdth" - --fi -- ++ ++ ++# Checking for alias gdth ++# Check whether --enable-gdth or --disable-gdth was given. ++if test "${enable_gdth+set}" = set; then ++ enableval="$enable_gdth" ++ enable_gdth="$enable_gdth" ++ +fi; - - # Checking for device driver option gdth - # Check whether --enable-gdth or --disable-gdth was given. - if test "${enable_gdth+set}" = set; then - enableval="$enable_gdth" -- if test "x$enableval" != xno; then --cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_GDTH 1 --EOF ++ ++# Checking for device driver option gdth ++# Check whether --enable-gdth or --disable-gdth was given. ++if test "${enable_gdth+set}" = set; then ++ enableval="$enable_gdth" + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_GDTH ++#define CONFIG_SCSI_GDTH 1 +_ACEOF - - device_drivers="$device_drivers gdth.o" - if test "${driver_class_scsi_selected+set}" != set; then - driver_class_scsi_selected=yes -- cat >> confdefs.h <<EOF ++ ++device_drivers="$device_drivers gdth.o" ++if test "${driver_class_scsi_selected+set}" != set; then ++ driver_class_scsi_selected=yes + cat >>confdefs.h <<_ACEOF #define $driver_class_scsi_option 1 -EOF @@ -13072,16 +13032,11 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu -fi +fi; - - - # Check whether --enable-flashpoint or --disable-flashpoint was given. - if test "${enable_flashpoint+set}" = set; then - enableval="$enable_flashpoint" -- --if test ${enableval} = no; then -- cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_OMIT_FLASHPOINT 1 --EOF ++ ++ ++# Check whether --enable-flashpoint or --disable-flashpoint was given. ++if test "${enable_flashpoint+set}" = set; then ++ enableval="$enable_flashpoint" + test x"$enableval" = xno && + +cat >>confdefs.h <<\_ACEOF @@ -13095,6 +13050,39 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + + + ++# Checking for alias starfire ++# Check whether --enable-starfire or --disable-starfire was given. ++if test "${enable_starfire+set}" = set; then ++ enableval="$enable_starfire" ++ enable_starfire="$enable_starfire" ++ ++fi; ++ ++# Checking for device driver option starfire ++# Check whether --enable-starfire or --disable-starfire was given. ++if test "${enable_starfire+set}" = set; then ++ enableval="$enable_starfire" ++ ++if test "x$enableval" != xno; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define CONFIG_STARFIRE 1 ++_ACEOF ++ ++device_drivers="$device_drivers starfire.o" ++if test "${driver_class_net_selected+set}" != set; then ++ driver_class_net_selected=yes ++ cat >>confdefs.h <<_ACEOF ++#define $driver_class_net_option 1 ++_ACEOF ++ ++ device_drivers="$device_drivers $driver_class_net_files" ++fi ++fi ++ ++fi; ++ ++ + +# Checking for alias sundance +# Check whether --enable-sundance or --disable-sundance was given. @@ -13112,7 +13100,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_CONFIG_SUNDANCE ++#define CONFIG_SUNDANCE 1 +_ACEOF + +device_drivers="$device_drivers sundance.o" @@ -13146,7 +13134,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_CONFIG_WINBOND840 ++#define CONFIG_WINBOND840 1 +_ACEOF + +device_drivers="$device_drivers winbond-840.o" @@ -13180,7 +13168,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_CONFIG_HAMACHI ++#define CONFIG_HAMACHI 1 +_ACEOF + +device_drivers="$device_drivers hamachi.o" @@ -13189,36 +13177,170 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + cat >>confdefs.h <<_ACEOF +#define $driver_class_net_option 1 +_ACEOF - ++ + device_drivers="$device_drivers $driver_class_net_files" - fi ++fi +fi + +fi; + + + ++# Checking for alias intel-gige ++# Check whether --enable-intel-gige or --disable-intel-gige was given. ++if test "${enable_intel_gige+set}" = set; then ++ enableval="$enable_intel_gige" ++ enable_intel_gige="$enable_intel-gige" + +-# Checking for alias ppa +-# Check whether --enable-ppa or --disable-ppa was given. +-if test "${enable_ppa+set}" = set; then +- enableval="$enable_ppa" +- enable_ppa="$enable_ppa" ++fi; + +-fi ++# Checking for device driver option intel_gige ++# Check whether --enable-intel_gige or --disable-intel_gige was given. ++if test "${enable_intel_gige+set}" = set; then ++ enableval="$enable_intel_gige" + ++if test "x$enableval" != xno; then + +-# Checking for device driver option ppa +-# Check whether --enable-ppa or --disable-ppa was given. +-if test "${enable_ppa+set}" = set; then +- enableval="$enable_ppa" +- if test "x$enableval" != xno; then +-cat >> confdefs.h <<\EOF +-#define CONFIG_SCSI_PPA 1 +-EOF ++cat >>confdefs.h <<\_ACEOF ++#define CONFIG_INTEL_GIGE 1 ++_ACEOF + +-device_drivers="$device_drivers ppa.o" +-if test "${driver_class_scsi_selected+set}" != set; then +- driver_class_scsi_selected=yes +- cat >> confdefs.h <<EOF +-#define $driver_class_scsi_option 1 +-EOF ++device_drivers="$device_drivers intel-gige.o" ++if test "${driver_class_net_selected+set}" != set; then ++ driver_class_net_selected=yes ++ cat >>confdefs.h <<_ACEOF ++#define $driver_class_net_option 1 ++_ACEOF + +- device_drivers="$device_drivers $driver_class_scsi_files" ++ device_drivers="$device_drivers $driver_class_net_files" + fi + fi + +-fi ++fi; + + +-# Checking for alias qlogicfas +-# Check whether --enable-qlogicfas or --disable-qlogicfas was given. +-if test "${enable_qlogicfas+set}" = set; then +- enableval="$enable_qlogicfas" +- enable_qlogicfas="$enable_qlogicfas" + +-fi ++# Checking for alias natsemi ++# Check whether --enable-natsemi or --disable-natsemi was given. ++if test "${enable_natsemi+set}" = set; then ++ enableval="$enable_natsemi" ++ enable_natsemi="$enable_natsemi" + ++fi; + +-# Checking for device driver option qlogicfas +-# Check whether --enable-qlogicfas or --disable-qlogicfas was given. +-if test "${enable_qlogicfas+set}" = set; then +- enableval="$enable_qlogicfas" +- if test "x$enableval" != xno; then +-cat >> confdefs.h <<\EOF +-#define CONFIG_SCSI_QLOGIC_FAS 1 +-EOF ++# Checking for device driver option natsemi ++# Check whether --enable-natsemi or --disable-natsemi was given. ++if test "${enable_natsemi+set}" = set; then ++ enableval="$enable_natsemi" + +-device_drivers="$device_drivers qlogicfas.o" +-if test "${driver_class_scsi_selected+set}" != set; then +- driver_class_scsi_selected=yes +- cat >> confdefs.h <<EOF +-#define $driver_class_scsi_option 1 +-EOF ++if test "x$enableval" != xno; then + +- device_drivers="$device_drivers $driver_class_scsi_files" ++cat >>confdefs.h <<\_ACEOF ++#define CONFIG_NATSEMI 1 ++_ACEOF + ++device_drivers="$device_drivers natsemi.o" ++if test "${driver_class_net_selected+set}" != set; then ++ driver_class_net_selected=yes ++ cat >>confdefs.h <<_ACEOF ++#define $driver_class_net_option 1 ++_ACEOF + -+ ++ device_drivers="$device_drivers $driver_class_net_files" + fi + fi + +-fi ++fi; + + +-# Checking for alias qlogicisp +-# Check whether --enable-qlogicisp or --disable-qlogicisp was given. +-if test "${enable_qlogicisp+set}" = set; then +- enableval="$enable_qlogicisp" +- enable_qlogicisp="$enable_qlogicisp" + +-fi +# Checking for alias myson803 +# Check whether --enable-myson803 or --disable-myson803 was given. +if test "${enable_myson803+set}" = set; then + enableval="$enable_myson803" + enable_myson803="$enable_myson803" -+ + +fi; -+ + +-# Checking for device driver option qlogicisp +-# Check whether --enable-qlogicisp or --disable-qlogicisp was given. +-if test "${enable_qlogicisp+set}" = set; then +- enableval="$enable_qlogicisp" +- if test "x$enableval" != xno; then +-cat >> confdefs.h <<\EOF +-#define CONFIG_SCSI_QLOGIC_ISP 1 +-EOF +# Checking for device driver option myson803 +# Check whether --enable-myson803 or --disable-myson803 was given. +if test "${enable_myson803+set}" = set; then + enableval="$enable_myson803" -+ + +-device_drivers="$device_drivers qlogicisp.o" +-if test "${driver_class_scsi_selected+set}" != set; then +- driver_class_scsi_selected=yes +- cat >> confdefs.h <<EOF +-#define $driver_class_scsi_option 1 +-EOF +if test "x$enableval" != xno; then -+ + +- device_drivers="$device_drivers $driver_class_scsi_files" +-fi +-fi +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_CONFIG_MYSON803 ++#define CONFIG_MYSON803 1 +_ACEOF -+ + +-fi +device_drivers="$device_drivers myson803.o" +if test "${driver_class_net_selected+set}" != set; then + driver_class_net_selected=yes @@ -13227,60 +13349,93 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +_ACEOF + device_drivers="$device_drivers $driver_class_net_files" - fi +fi -+ ++fi + +-# Checking for alias gdth +-# Check whether --enable-gdth or --disable-gdth was given. +-if test "${enable_gdth+set}" = set; then +- enableval="$enable_gdth" +- enable_gdth="$enable_gdth" +fi; -+ -+ -+ + +-fi + + +-# Checking for device driver option gdth +-# Check whether --enable-gdth or --disable-gdth was given. +-if test "${enable_gdth+set}" = set; then +- enableval="$enable_gdth" +- if test "x$enableval" != xno; then +-cat >> confdefs.h <<\EOF +-#define CONFIG_SCSI_GDTH 1 +-EOF +# Checking for alias ns820 +# Check whether --enable-ns820 or --disable-ns820 was given. +if test "${enable_ns820+set}" = set; then + enableval="$enable_ns820" + enable_ns820="$enable_ns820" -+ + +-device_drivers="$device_drivers gdth.o" +-if test "${driver_class_scsi_selected+set}" != set; then +- driver_class_scsi_selected=yes +- cat >> confdefs.h <<EOF +-#define $driver_class_scsi_option 1 +-EOF +fi; +- device_drivers="$device_drivers $driver_class_scsi_files" +-fi +-fi +# Checking for device driver option ns820 +# Check whether --enable-ns820 or --disable-ns820 was given. +if test "${enable_ns820+set}" = set; then + enableval="$enable_ns820" -+ + +-fi +if test "x$enableval" != xno; then -+ + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_CONFIG_NS820 ++#define CONFIG_NS820 1 +_ACEOF -+ + +-# Check whether --enable-flashpoint or --disable-flashpoint was given. +-if test "${enable_flashpoint+set}" = set; then +- enableval="$enable_flashpoint" +- +-if test ${enableval} = no; then +- cat >> confdefs.h <<\EOF +-#define CONFIG_SCSI_OMIT_FLASHPOINT 1 +-EOF +device_drivers="$device_drivers ns820.o" +if test "${driver_class_net_selected+set}" != set; then + driver_class_net_selected=yes + cat >>confdefs.h <<_ACEOF +#define $driver_class_net_option 1 +_ACEOF -+ + + device_drivers="$device_drivers $driver_class_net_files" -+fi -+fi + fi +- + fi +- +fi; -@@ -2711,46 +4308,49 @@ +@@ -2711,46 +4417,49 @@ # Check whether --enable-ne2000 or --disable-ne2000 was given. if test "${enable_ne2000+set}" = set; then enableval="$enable_ne2000" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_NE2000 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_NE2000 + #define CONFIG_NE2000 1 +-EOF +_ACEOF device_drivers="$device_drivers ne.o 8390.o" @@ -13306,13 +13461,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_el2" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_EL2 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_EL2 + #define CONFIG_EL2 1 +-EOF +_ACEOF device_drivers="$device_drivers 3c503.o 8390.o" @@ -13333,7 +13487,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c509 -@@ -2759,53 +4359,56 @@ +@@ -2759,53 +4468,56 @@ enableval="$enable_3c509" enable_el3="$enable_3c509" @@ -13347,13 +13501,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_el3" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_EL3 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_EL3 + #define CONFIG_EL3 1 +-EOF +_ACEOF device_drivers="$device_drivers 3c509.o" @@ -13379,13 +13532,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_wd80x3" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_WD80x3 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_WD80x3 + #define CONFIG_WD80x3 1 +-EOF +_ACEOF device_drivers="$device_drivers wd.o 8390.o" @@ -13406,7 +13558,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c501 -@@ -2814,122 +4417,128 @@ +@@ -2814,122 +4526,128 @@ enableval="$enable_3c501" enable_el1="$enable_3c501" @@ -13420,13 +13572,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_el1" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_EL1 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_EL1 + #define CONFIG_EL1 1 +-EOF +_ACEOF device_drivers="$device_drivers 3c501.o" @@ -13452,13 +13603,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_ul" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_ULTRA 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_ULTRA + #define CONFIG_ULTRA 1 +-EOF +_ACEOF device_drivers="$device_drivers smc-ultra.o 8390.o" @@ -13484,13 +13634,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_ul32" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_ULTRA32 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_ULTRA32 + #define CONFIG_ULTRA32 1 +-EOF +_ACEOF device_drivers="$device_drivers smc-ultra32.o 8390.o" @@ -13516,13 +13665,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_hplanplus" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_HPLAN_PLUS 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_HPLAN_PLUS + #define CONFIG_HPLAN_PLUS 1 +-EOF +_ACEOF device_drivers="$device_drivers hp-plus.o 8390.o" @@ -13548,13 +13696,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_hplan" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_HPLAN 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_HPLAN + #define CONFIG_HPLAN 1 +-EOF +_ACEOF device_drivers="$device_drivers hp.o 8390.o" @@ -13575,7 +13722,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c59x -@@ -2938,30 +4547,32 @@ +@@ -2938,30 +4656,32 @@ enableval="$enable_3c59x" enable_vortex="$enable_3c59x" @@ -13589,13 +13736,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_vortex" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_VORTEX 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_VORTEX + #define CONFIG_VORTEX 1 +-EOF +_ACEOF device_drivers="$device_drivers 3c59x.o" @@ -13617,7 +13763,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias seeq8005 -@@ -2970,30 +4581,32 @@ +@@ -2970,30 +4690,32 @@ enableval="$enable_seeq8005" enable_seeq8005="$enable_seeq8005" @@ -13631,13 +13777,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_seeq8005" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SEEQ8005 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SEEQ8005 + #define CONFIG_SEEQ8005 1 +-EOF +_ACEOF device_drivers="$device_drivers seeq8005.o" @@ -13659,7 +13804,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias hp100 -@@ -3002,76 +4615,80 @@ +@@ -3002,76 +4724,80 @@ enableval="$enable_hp100" enable_hp100="$enable_hp100" @@ -13673,13 +13818,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_hp100" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_HP100 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_HP100 + #define CONFIG_HP100 1 +-EOF +_ACEOF device_drivers="$device_drivers hp100.o" @@ -13705,13 +13849,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_ac3200" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_AC3200 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_AC3200 + #define CONFIG_AC3200 1 +-EOF +_ACEOF device_drivers="$device_drivers ac3200.o 8390.o" @@ -13737,13 +13880,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_e2100" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_E2100 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_E2100 + #define CONFIG_E2100 1 +-EOF +_ACEOF device_drivers="$device_drivers e2100.o 8390.o" @@ -13764,7 +13906,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias at1700 -@@ -3080,30 +4697,32 @@ +@@ -3080,30 +4806,32 @@ enableval="$enable_at1700" enable_at1700="$enable_at1700" @@ -13778,13 +13920,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_at1700" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_AT1700 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_AT1700 + #define CONFIG_AT1700 1 +-EOF +_ACEOF device_drivers="$device_drivers at1700.o" @@ -13806,7 +13947,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias eth16i -@@ -3112,30 +4731,32 @@ +@@ -3112,30 +4840,32 @@ enableval="$enable_eth16i" enable_eth16i="$enable_eth16i" @@ -13820,13 +13961,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_eth16i" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_ETH16I 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_ETH16I + #define CONFIG_ETH16I 1 +-EOF +_ACEOF device_drivers="$device_drivers eth16i.o" @@ -13848,7 +13988,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias znet -@@ -3144,30 +4765,32 @@ +@@ -3144,30 +4874,32 @@ enableval="$enable_znet" enable_znet="$enable_znet" @@ -13862,13 +14002,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_znet" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_ZNET 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_ZNET + #define CONFIG_ZNET 1 +-EOF +_ACEOF device_drivers="$device_drivers znet.o" @@ -13890,7 +14029,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias eexpress -@@ -3176,30 +4799,32 @@ +@@ -3176,30 +4908,32 @@ enableval="$enable_eexpress" enable_eexpress="$enable_eexpress" @@ -13904,13 +14043,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_eexpress" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_EEXPRESS 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_EEXPRESS + #define CONFIG_EEXPRESS 1 +-EOF +_ACEOF device_drivers="$device_drivers eexpress.o" @@ -13932,7 +14070,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias eepro -@@ -3208,30 +4833,32 @@ +@@ -3208,30 +4942,32 @@ enableval="$enable_eepro" enable_eexpresspro="$enable_eepro" @@ -13946,13 +14084,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_eexpresspro" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_EEXPRESS_PRO 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_EEXPRESS_PRO + #define CONFIG_EEXPRESS_PRO 1 +-EOF +_ACEOF device_drivers="$device_drivers eepro.o" @@ -13974,7 +14111,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias eepro100 -@@ -3240,30 +4867,32 @@ +@@ -3240,30 +4976,32 @@ enableval="$enable_eepro100" enable_eexpresspro100="$enable_eepro100" @@ -13988,13 +14125,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_eexpresspro100" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_EEXPRESS_PRO100B 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_EEXPRESS_PRO100B + #define CONFIG_EEXPRESS_PRO100B 1 +-EOF +_ACEOF device_drivers="$device_drivers eepro100.o" @@ -14016,7 +14152,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias depca -@@ -3272,30 +4901,32 @@ +@@ -3272,30 +5010,32 @@ enableval="$enable_depca" enable_depca="$enable_depca" @@ -14030,13 +14166,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_depca" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_DEPCA 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_DEPCA + #define CONFIG_DEPCA 1 +-EOF +_ACEOF device_drivers="$device_drivers depca.o" @@ -14058,7 +14193,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ewrk3 -@@ -3304,30 +4935,32 @@ +@@ -3304,30 +5044,32 @@ enableval="$enable_ewrk3" enable_ewrk3="$enable_ewrk3" @@ -14072,13 +14207,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_ewrk3" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_EWRK3 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_EWRK3 + #define CONFIG_EWRK3 1 +-EOF +_ACEOF device_drivers="$device_drivers ewrk3.o" @@ -14100,7 +14234,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de4x5 -@@ -3336,30 +4969,32 @@ +@@ -3336,30 +5078,32 @@ enableval="$enable_de4x5" enable_de4x5="$enable_de4x5" @@ -14114,13 +14248,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_de4x5" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_DE4X5 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_DE4X5 + #define CONFIG_DE4X5 1 +-EOF +_ACEOF device_drivers="$device_drivers de4x5.o" @@ -14142,7 +14275,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias apricot -@@ -3368,30 +5003,32 @@ +@@ -3368,30 +5112,32 @@ enableval="$enable_apricot" enable_apricot="$enable_apricot" @@ -14156,13 +14289,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_apricot" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_APRICOT 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_APRICOT + #define CONFIG_APRICOT 1 +-EOF +_ACEOF device_drivers="$device_drivers apricot.o" @@ -14184,7 +14316,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias wavelan -@@ -3400,30 +5037,32 @@ +@@ -3400,30 +5146,32 @@ enableval="$enable_wavelan" enable_wavelan="$enable_wavelan" @@ -14198,13 +14330,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_wavelan" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_WAVELAN 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_WAVELAN + #define CONFIG_WAVELAN 1 +-EOF +_ACEOF device_drivers="$device_drivers wavelan.o" @@ -14226,7 +14357,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c507 -@@ -3432,30 +5071,32 @@ +@@ -3432,30 +5180,32 @@ enableval="$enable_3c507" enable_el16="$enable_3c507" @@ -14240,13 +14371,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_el16" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_EL16 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_EL16 + #define CONFIG_EL16 1 +-EOF +_ACEOF device_drivers="$device_drivers 3c507.o" @@ -14268,7 +14398,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c505 -@@ -3464,30 +5105,32 @@ +@@ -3464,30 +5214,32 @@ enableval="$enable_3c505" enable_elplus="$enable_3c505" @@ -14282,13 +14412,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_elplus" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_ELPLUS 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_ELPLUS + #define CONFIG_ELPLUS 1 +-EOF +_ACEOF device_drivers="$device_drivers 3c505.o" @@ -14310,7 +14439,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de600 -@@ -3496,30 +5139,32 @@ +@@ -3496,30 +5248,32 @@ enableval="$enable_de600" enable_de600="$enable_de600" @@ -14324,13 +14453,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_de600" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_DE600 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_DE600 + #define CONFIG_DE600 1 +-EOF +_ACEOF device_drivers="$device_drivers de600.o" @@ -14352,7 +14480,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de620 -@@ -3528,30 +5173,32 @@ +@@ -3528,30 +5282,32 @@ enableval="$enable_de620" enable_de620="$enable_de620" @@ -14366,13 +14494,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_de620" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_DE620 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_DE620 + #define CONFIG_DE620 1 +-EOF +_ACEOF device_drivers="$device_drivers de620.o" @@ -14394,7 +14521,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias sk_g16 -@@ -3560,30 +5207,32 @@ +@@ -3560,30 +5316,32 @@ enableval="$enable_sk_g16" enable_skg16="$enable_sk_g16" @@ -14408,13 +14535,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_skg16" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SK_G16 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SK_G16 + #define CONFIG_SK_G16 1 +-EOF +_ACEOF device_drivers="$device_drivers sk_g16.o" @@ -14436,7 +14562,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ni52 -@@ -3592,30 +5241,32 @@ +@@ -3592,30 +5350,32 @@ enableval="$enable_ni52" enable_ni52="$enable_ni52" @@ -14450,13 +14576,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_ni52" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_NI52 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_NI52 + #define CONFIG_NI52 1 +-EOF +_ACEOF device_drivers="$device_drivers ni52.o" @@ -14478,7 +14603,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ni65 -@@ -3624,30 +5275,32 @@ +@@ -3624,30 +5384,32 @@ enableval="$enable_ni65" enable_ni65="$enable_ni65" @@ -14492,13 +14617,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_ni65" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_NI65 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_NI65 + #define CONFIG_NI65 1 +-EOF +_ACEOF device_drivers="$device_drivers ni65.o" @@ -14520,7 +14644,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias atp -@@ -3656,30 +5309,32 @@ +@@ -3656,30 +5418,32 @@ enableval="$enable_atp" enable_atp="$enable_atp" @@ -14534,13 +14658,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_atp" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_ATP 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_ATP + #define CONFIG_ATP 1 +-EOF +_ACEOF device_drivers="$device_drivers atp.o" @@ -14562,7 +14685,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias lance -@@ -3688,30 +5343,32 @@ +@@ -3688,30 +5452,32 @@ enableval="$enable_lance" enable_lance="$enable_lance" @@ -14576,13 +14699,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_lance" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_LANCE 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_LANCE + #define CONFIG_LANCE 1 +-EOF +_ACEOF device_drivers="$device_drivers lance.o" @@ -14604,7 +14726,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias tulip -@@ -3720,30 +5377,32 @@ +@@ -3720,30 +5486,32 @@ enableval="$enable_tulip" enable_elcp="$enable_tulip" @@ -14618,13 +14740,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_elcp" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_DEC_ELCP 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_DEC_ELCP + #define CONFIG_DEC_ELCP 1 +-EOF +_ACEOF device_drivers="$device_drivers tulip.o" @@ -14646,7 +14767,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias fmv18x -@@ -3752,30 +5411,32 @@ +@@ -3752,30 +5520,32 @@ enableval="$enable_fmv18x" enable_fmv18x="$enable_fmv18x" @@ -14660,13 +14781,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_fmv18x" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_FMV18X 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_FMV18X + #define CONFIG_FMV18X 1 +-EOF +_ACEOF device_drivers="$device_drivers fmv18x.o" @@ -14688,7 +14808,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c515 -@@ -3784,30 +5445,32 @@ +@@ -3784,30 +5554,32 @@ enableval="$enable_3c515" enable_3c515="$enable_3c515" @@ -14702,13 +14822,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_3c515" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_3C515 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_3C515 + #define CONFIG_3C515 1 +-EOF +_ACEOF device_drivers="$device_drivers 3c515.o" @@ -14730,7 +14849,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias pcnet32 -@@ -3816,53 +5479,56 @@ +@@ -3816,53 +5588,56 @@ enableval="$enable_pcnet32" enable_pcnet32="$enable_pcnet32" @@ -14744,13 +14863,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_pcnet32" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_PCNET32 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_PCNET32 + #define CONFIG_PCNET32 1 +-EOF +_ACEOF device_drivers="$device_drivers pcnet32.o" @@ -14776,13 +14894,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_ne2kpci" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_NE2K_PCI 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_NE2K_PCI + #define CONFIG_NE2K_PCI 1 +-EOF +_ACEOF device_drivers="$device_drivers ne2k-pci.o 8390.o" @@ -14803,7 +14920,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias yellowfin -@@ -3871,30 +5537,32 @@ +@@ -3871,30 +5646,32 @@ enableval="$enable_yellowfin" enable_yellowfin="$enable_yellowfin" @@ -14817,13 +14934,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_yellowfin" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_YELLOWFIN 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_YELLOWFIN + #define CONFIG_YELLOWFIN 1 +-EOF +_ACEOF device_drivers="$device_drivers yellowfin.o" @@ -14845,7 +14961,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias rtl8139 -@@ -3903,30 +5571,32 @@ +@@ -3903,30 +5680,32 @@ enableval="$enable_rtl8139" enable_rtl8139="$enable_rtl8139" @@ -14859,13 +14975,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_rtl8139" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_RTL8139 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_RTL8139 + #define CONFIG_RTL8139 1 +-EOF +_ACEOF device_drivers="$device_drivers rtl8139.o" @@ -14887,7 +15002,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias epic100 -@@ -3935,30 +5605,32 @@ +@@ -3935,30 +5714,32 @@ enableval="$enable_epic100" enable_epic="$enable_epic100" @@ -14901,13 +15016,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_epic" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_EPIC 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_EPIC + #define CONFIG_EPIC 1 +-EOF +_ACEOF device_drivers="$device_drivers epic100.o" @@ -14929,7 +15043,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias tlan -@@ -3967,30 +5639,32 @@ +@@ -3967,30 +5748,32 @@ enableval="$enable_tlan" enable_tlan="$enable_tlan" @@ -14943,13 +15057,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_tlan" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_TLAN 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_TLAN + #define CONFIG_TLAN 1 +-EOF +_ACEOF device_drivers="$device_drivers tlan.o" @@ -14971,7 +15084,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias via-rhine -@@ -3999,389 +5673,1150 @@ +@@ -3999,389 +5782,1150 @@ enableval="$enable_via_rhine" enable_viarhine="$enable_via-rhine" @@ -14985,13 +15098,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu enableval="$enable_viarhine" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_VIA_RHINE 1 --EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_VIA_RHINE + #define CONFIG_VIA_RHINE 1 +-EOF +_ACEOF device_drivers="$device_drivers via-rhine.o" @@ -16417,9 +16529,9 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +fi diff -Naur gnumach-20040915.orig/i386/linux/device-drivers.h.in gnumach-20040915/i386/linux/device-drivers.h.in ---- gnumach-20040915.orig/i386/linux/device-drivers.h.in 2004-09-18 22:26:47.000000000 +0200 -+++ gnumach-20040915/i386/linux/device-drivers.h.in 2004-09-18 22:28:33.000000000 +0200 -@@ -1,85 +1,274 @@ +--- gnumach-20040915.orig/i386/linux/device-drivers.h.in 2001-05-27 14:44:22.000000000 +0200 ++++ gnumach-20040915/i386/linux/device-drivers.h.in 2004-10-25 06:48:08.000000000 +0200 +@@ -1,84 +1,289 @@ -/* All possible device drivers; must match Drivers.in. */ +/* device-drivers.h.in. Generated from configure.ac by autoheader. */ @@ -16441,27 +16553,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/device-drivers.h.in gnumach-20040915 +/* floppy */ +#undef CONFIG_BLK_DEV_FD + -+/* Force DMA on block devices */ ++/* Force DMA on IDE block devices */ +#undef CONFIG_BLK_DEV_FORCE_DMA + +/* ide */ +#undef CONFIG_BLK_DEV_IDE + -+/* hamachi */ -+#undef CONFIG_CONFIG_HAMACHI -+ -+/* myson803 */ -+#undef CONFIG_CONFIG_MYSON803 -+ -+/* ns820 */ -+#undef CONFIG_CONFIG_NS820 -+ -+/* sundance */ -+#undef CONFIG_CONFIG_SUNDANCE -+ -+/* winbond_840 */ -+#undef CONFIG_CONFIG_WINBOND840 -+ +/* de4x5 */ +#undef CONFIG_DE4X5 + @@ -16516,6 +16613,9 @@ diff -Naur gnumach-20040915.orig/i386/linux/device-drivers.h.in gnumach-20040915 +/* fmv18x */ +#undef CONFIG_FMV18X + ++/* hamachi */ ++#undef CONFIG_HAMACHI ++ +/* hp100 */ +#undef CONFIG_HP100 + @@ -16525,6 +16625,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/device-drivers.h.in gnumach-20040915 +/* hplanplus */ +#undef CONFIG_HPLAN_PLUS + ++/* Driver Class net */ ++#undef CONFIG_INET ++ ++/* intel_gige */ ++#undef CONFIG_INTEL_GIGE ++ +/* lance */ +#undef CONFIG_LANCE + @@ -16540,11 +16646,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/device-drivers.h.in gnumach-20040915 +/* 686 */ #undef CONFIG_M686 -#undef CPU --#undef CONFIG_SCSI --#undef CONFIG_INET --#undef CONFIG_BLK_DEV_FD --#undef CONFIG_BLK_DEV_IDE --#undef CONFIG_BLK_DEV_FORCE_DMA ++ ++/* myson803 */ ++#undef CONFIG_MYSON803 ++ ++/* natsemi */ ++#undef CONFIG_NATSEMI + +/* ne2000 */ +#undef CONFIG_NE2000 @@ -16558,12 +16665,21 @@ diff -Naur gnumach-20040915.orig/i386/linux/device-drivers.h.in gnumach-20040915 +/* ni65 */ +#undef CONFIG_NI65 + ++/* ns820 */ ++#undef CONFIG_NS820 ++ +/* pcnet32 */ +#undef CONFIG_PCNET32 + +/* rtl8139 */ +#undef CONFIG_RTL8139 + ++/* Driver Class scsi */ + #undef CONFIG_SCSI +-#undef CONFIG_INET +-#undef CONFIG_BLK_DEV_FD +-#undef CONFIG_BLK_DEV_IDE ++ +/* wd7000 */ +#undef CONFIG_SCSI_7000FASST + @@ -16678,6 +16794,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/device-drivers.h.in gnumach-20040915 +/* skg16 */ +#undef CONFIG_SK_G16 + ++/* starfire */ ++#undef CONFIG_STARFIRE ++ ++/* sundance */ ++#undef CONFIG_SUNDANCE ++ +/* tlan */ +#undef CONFIG_TLAN + @@ -16729,6 +16851,9 @@ diff -Naur gnumach-20040915.orig/i386/linux/device-drivers.h.in gnumach-20040915 +/* wd80x3 */ +#undef CONFIG_WD80x3 + ++/* winbond_840 */ ++#undef CONFIG_WINBOND840 ++ +/* yellowfin */ #undef CONFIG_YELLOWFIN -#undef CONFIG_RTL8139 @@ -16758,9 +16883,9 @@ diff -Naur gnumach-20040915.orig/i386/linux/device-drivers.h.in gnumach-20040915 +#undef PACKAGE_VERSION diff -Naur gnumach-20040915.orig/linux/aclocal.m4 gnumach-20040915/linux/aclocal.m4 --- gnumach-20040915.orig/linux/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 -+++ gnumach-20040915/linux/aclocal.m4 2004-09-18 22:27:41.000000000 +0200 ++++ gnumach-20040915/linux/aclocal.m4 2004-10-25 06:47:59.000000000 +0200 @@ -0,0 +1,14 @@ -+# generated automatically by aclocal 1.9.1 -*- Autoconf -*- ++# generated automatically by aclocal 1.9.2 -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. @@ -16776,7 +16901,7 @@ diff -Naur gnumach-20040915.orig/linux/aclocal.m4 gnumach-20040915/linux/aclocal +m4_include([../aclocal.m4]) diff -Naur gnumach-20040915.orig/linux/configure gnumach-20040915/linux/configure --- gnumach-20040915.orig/linux/configure 1999-05-23 01:35:45.000000000 +0200 -+++ gnumach-20040915/linux/configure 2004-09-18 22:27:48.000000000 +0200 ++++ gnumach-20040915/linux/configure 2004-10-25 06:48:00.000000000 +0200 @@ -1,26 +1,288 @@ #! /bin/sh - |