Sync with autoconf changes.

1 files changed, 391 insertions, 184 deletions

diff --git a/debian/patches/90_autoconf_autogen.patch b/debian/patches/90_autoconf_autogen.patch
index 28e742c..1187110 100644
--- a/debian/patches/90_autoconf_autogen.patch
+++ b/debian/patches/90_autoconf_autogen.patch
@@ -1,6 +1,11 @@
-diff -Naur gnumach-20040229.orig/configure gnumach-20040229/configure
---- gnumach-20040229.orig/configure	2004-03-01 00:26:39.000000000 +0100
-+++ gnumach-20040229/configure	2004-09-15 13:48:47.000000000 +0200
+#DPATCHLEVEL=1
+
+This patch is just autogenerated stuff, do not hack directly on it.
+
+
+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 21:52:36.000000000 +0200
 @@ -1,31 +1,293 @@
  #! /bin/sh
 -
@@ -4778,9 +4783,9 @@ diff -Naur gnumach-20040229.orig/configure gnumach-20040229/configure
    done
  fi
  
-diff -Naur gnumach-20040229.orig/i386/configure gnumach-20040229/i386/configure
---- gnumach-20040229.orig/i386/configure	2004-03-01 00:26:39.000000000 +0100
-+++ gnumach-20040229/i386/configure	2004-09-15 13:48:42.000000000 +0200
+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 21:52:31.000000000 +0200
 @@ -1,28 +1,289 @@
  #! /bin/sh
 -
@@ -6205,16 +6210,18 @@ diff -Naur gnumach-20040229.orig/i386/configure gnumach-20040229/i386/configure
  
  
  
-@@ -528,414 +1242,1114 @@
+@@ -528,414 +1242,1115 @@
  # Check whether --enable-lpr or --disable-lpr was given.
  if test "${enable_lpr+set}" = set; then
    enableval="$enable_lpr"
 -  test "x$enableval" = xno || cat >> confdefs.h <<\EOF
-+  test "x$enableval" = xno || cat >>confdefs.h <<\_ACEOF
- #define MACH_LPR 1
+-#define MACH_LPR 1
 -EOF
 -
 -fi
++  test "x$enableval" = xno ||
++cat >>confdefs.h <<\_ACEOF
++#define MACH_LPR
 +_ACEOF
  
 +fi;
@@ -7631,7 +7638,7 @@ diff -Naur gnumach-20040229.orig/i386/configure gnumach-20040229/i386/configure
  if test "$no_recursion" != yes; then
  
    # Remove --cache-file and --srcdir arguments so they do not pile up.
-@@ -946,86 +2360,167 @@
+@@ -946,86 +2361,167 @@
        ac_prev=
        continue
      fi
@@ -7842,9 +7849,9 @@ diff -Naur gnumach-20040229.orig/i386/configure gnumach-20040229/i386/configure
    done
  fi
  
-diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linux/configure
---- gnumach-20040229.orig/i386/linux/configure	2004-03-01 00:26:39.000000000 +0100
-+++ gnumach-20040229/i386/linux/configure	2004-09-15 13:48:32.000000000 +0200
+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 21:52:20.000000000 +0200
 @@ -1,392 +1,288 @@
  #! /bin/sh
 -
@@ -8941,8 +8948,11 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  if test -n "$ac_prev"; then
 -  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 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
+ 
 -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
 -
 -# File descriptor usage:
@@ -8957,12 +8967,9 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 -  exec 6>/dev/null
 -else
 -  exec 6>&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
 -exec 5>./config.log
- 
+-
 -echo "\
 -This file contains any messages produced by compilers while
 -running configure, to aid debugging if configure makes a mistake.
@@ -9064,7 +9071,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
    srcdir=$ac_confdir
    if test ! -r $srcdir/$ac_unique_file; then
      srcdir=..
-@@ -835,13 +690,462 @@
+@@ -835,13 +690,648 @@
  fi
  if test ! -r $srcdir/$ac_unique_file; then
    if test "$ac_srcdir_defaulted" = yes; then
@@ -9121,7 +9128,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 +\`configure' configures GNU Mach 1.3 to adapt to many kinds of systems.
 +
 +Usage: $0 [OPTION]... [VAR=VALUE]...
- 
++
 +To assign environment variables (e.g., CC, CFLAGS...), specify them as
 +VAR=VALUE.  See below for descriptions of some of the useful variables.
 +
@@ -9186,7 +9193,193 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 +Optional Features:
 +  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
 +  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-+
++  --enable-3c501          enable driver alias 3c501
++  --enable-3c503          enable driver alias 3c503
++  --enable-3c509          enable driver alias 3c509
++  --enable-3c579          enable driver alias 3c579
++  --enable-3c59x          enable driver alias 3c59x
++  --enable-3c90x          enable driver alias 3c90x
++  --enable-hpj2577        enable driver alias hpj2577
++  --enable-hpj2573        enable driver alias hpj2573
++  --enable-hpj2585        enable driver alias hpj2585
++  --enable-hp27248b       enable driver alias hp27248b
++  --enable-eth32          enable driver alias eth32
++  --enable-znote          enable driver alias znote
++  --enable-de100          enable driver alias de100
++  --enable-de101          enable driver alias de101
++  --enable-de200          enable driver alias de200
++  --enable-de201          enable driver alias de201
++  --enable-de202          enable driver alias de202
++  --enable-de210          enable driver alias de210
++  --enable-de422          enable driver alias de422
++  --enable-de203          enable driver alias de203
++  --enable-de204          enable driver alias de204
++  --enable-de205          enable driver alias de205
++  --enable-de425          enable driver alias de425
++  --enable-de434          enable driver alias de434
++  --enable-de435          enable driver alias de435
++  --enable-de450          enable driver alias de450
++  --enable-de500          enable driver alias de500
++  --enable-3c507          enable driver alias 3c507
++  --enable-3c505          enable driver alias 3c505
++  --enable-ne1000         enable driver alias ne1000
++  --enable-ne             enable driver alias ne
++  --enable-at1500         enable driver alias at1500
++  --enable-ne2100         enable driver alias ne2100
++  --enable-tulip          enable driver alias tulip
++  --enable-rtl8129        enable driver alias rtl8129
++  --enable-aha2825        enable driver alias aha2825
++  --enable-ncr53c400      enable driver alias ncr53c400
++  --enable-t128f          enable driver alias t128f
++  --enable-t228           enable driver alias t228
++  --enable-am79c974       enable driver alias am79c974
++  --enable-dtc3180        enable driver alias dtc3180
++  --enable-dc390w         enable driver alias dc390w
++  --enable-dc390u         enable driver alias dc390u
++  --enable-dc390f         enable driver alias dc390f
++  --enable-dc390          enable driver alias dc390
++  --enable-epic100        enable driver alias epic100
++  --enable-floppy         enable driver floppy
++  --enable-ide            enable driver ide
++
++  --enable-advansys       enable driver alias advansys
++  --enable-advansys       enable driver advansys
++  --enable-BusLogic       enable driver alias BusLogic
++  --enable-buslogic       enable driver buslogic
++  --enable-u14-34f        enable driver alias u14-34f
++  --enable-u1434f         enable driver u1434f
++  --enable-ultrastor      enable driver alias ultrastor
++  --enable-ultrastor      enable driver ultrastor
++  --enable-aha152x        enable driver alias aha152x
++  --enable-aha152x        enable driver aha152x
++  --enable-aha1542        enable driver alias aha1542
++  --enable-aha1542        enable driver aha1542
++  --enable-aha1740        enable driver alias aha1740
++  --enable-aha1740        enable driver aha1740
++  --enable-aic7xxx        enable driver alias aic7xxx
++  --enable-aic7xxx        enable driver aic7xxx
++  --enable-fdomain        enable driver alias fdomain
++  --enable-futuredomain   enable driver futuredomain
++  --enable-in2000         enable driver alias in2000
++  --enable-in2000         enable driver in2000
++  --enable-g_NCR5380      enable driver alias g_NCR5380
++  --enable-ncr5380        enable driver ncr5380
++  --enable-NCR53c406a     enable driver alias NCR53c406a
++  --enable-ncr53c406a     enable driver ncr53c406a
++  --enable-pas16          enable driver alias pas16
++  --enable-pas16          enable driver pas16
++  --enable-seagate        enable driver alias seagate
++  --enable-seagate        enable driver seagate
++  --enable-t128           enable driver alias t128
++  --enable-t128           enable driver t128
++  --enable-53c78xx        enable driver alias 53c78xx
++  --enable-ncr53c7xx      enable driver ncr53c7xx
++  --enable-eata_dma       enable driver alias eata_dma
++  --enable-eatadma        enable driver eatadma
++  --enable-eata_pio       enable driver alias eata_pio
++  --enable-eatapio        enable driver eatapio
++  --enable-wd7000         enable driver alias wd7000
++  --enable-wd7000         enable driver wd7000
++  --enable-eata           enable driver alias eata
++  --enable-eata           enable driver eata
++  --enable-AM53C974       enable driver alias AM53C974
++  --enable-am53c974       enable driver am53c974
++  --enable-dtc            enable driver alias dtc
++  --enable-dtc3280        enable driver dtc3280
++  --enable-ncr53c8xx      enable driver alias ncr53c8xx
++  --enable-ncr53c8xx      enable driver ncr53c8xx
++  --enable-tmscsim        enable driver alias tmscsim
++  --enable-dc390t         enable driver dc390t
++  --enable-ppa            enable driver alias ppa
++  --enable-ppa            enable driver ppa
++  --enable-qlogicfas      enable driver alias qlogicfas
++  --enable-qlogicfas      enable driver qlogicfas
++  --enable-qlogicisp      enable driver alias qlogicisp
++  --enable-qlogicisp      enable driver qlogicisp
++  --enable-gdth           enable driver alias gdth
++  --enable-gdth           enable driver gdth
++  --enable-flashpoint     enable SCSI flashpoint [default=no]
++  --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-myson803       enable driver alias myson803
++  --enable-myson803       enable driver myson803
++  --enable-ns820          enable driver alias ns820
++  --enable-ns820          enable driver ns820
++  --enable-ne2000         enable driver ne2000
++  --enable-el2            enable driver el2
++  --enable-el3            enable driver el3
++  --enable-wd80x3         enable driver wd80x3
++  --enable-el1            enable driver el1
++  --enable-ul             enable driver ul
++  --enable-ul32           enable driver ul32
++  --enable-hplanplus      enable driver hplanplus
++  --enable-hplan          enable driver hplan
++  --enable-vortex         enable driver vortex
++  --enable-seeq8005       enable driver alias seeq8005
++  --enable-seeq8005       enable driver seeq8005
++  --enable-hp100          enable driver alias hp100
++  --enable-hp100          enable driver hp100
++  --enable-ac3200         enable driver ac3200
++  --enable-e2100          enable driver e2100
++  --enable-at1700         enable driver alias at1700
++  --enable-at1700         enable driver at1700
++  --enable-eth16i         enable driver alias eth16i
++  --enable-eth16i         enable driver eth16i
++  --enable-znet           enable driver alias znet
++  --enable-znet           enable driver znet
++  --enable-eexpress       enable driver alias eexpress
++  --enable-eexpress       enable driver eexpress
++  --enable-eepro          enable driver alias eepro
++  --enable-eexpresspro    enable driver eexpresspro
++  --enable-eepro100       enable driver alias eepro100
++  --enable-eexpresspro100 enable driver eexpresspro100
++  --enable-depca          enable driver alias depca
++  --enable-depca          enable driver depca
++  --enable-ewrk3          enable driver alias ewrk3
++  --enable-ewrk3          enable driver ewrk3
++  --enable-de4x5          enable driver alias de4x5
++  --enable-de4x5          enable driver de4x5
++  --enable-apricot        enable driver alias apricot
++  --enable-apricot        enable driver apricot
++  --enable-wavelan        enable driver alias wavelan
++  --enable-wavelan        enable driver wavelan
++  --enable-el16           enable driver el16
++  --enable-elplus         enable driver elplus
++  --enable-de600          enable driver alias de600
++  --enable-de600          enable driver de600
++  --enable-de620          enable driver alias de620
++  --enable-de620          enable driver de620
++  --enable-sk_g16         enable driver alias sk_g16
++  --enable-skg16          enable driver skg16
++  --enable-ni52           enable driver alias ni52
++  --enable-ni52           enable driver ni52
++  --enable-ni65           enable driver alias ni65
++  --enable-ni65           enable driver ni65
++  --enable-atp            enable driver alias atp
++  --enable-atp            enable driver atp
++  --enable-lance          enable driver alias lance
++  --enable-lance          enable driver lance
++  --enable-elcp           enable driver elcp
++  --enable-fmv18x         enable driver alias fmv18x
++  --enable-fmv18x         enable driver fmv18x
++  --enable-3c515          enable driver alias 3c515
++  --enable-3c515          enable driver 3c515
++  --enable-pcnet32        enable driver alias pcnet32
++  --enable-pcnet32        enable driver pcnet32
++  --enable-ne2kpci        enable driver ne2kpci
++  --enable-yellowfin      enable driver alias yellowfin
++  --enable-yellowfin      enable driver yellowfin
++  --enable-rtl8139        enable driver alias rtl8139
++  --enable-rtl8139        enable driver rtl8139
++  --enable-epic           enable driver epic
++  --enable-tlan           enable driver alias tlan
++  --enable-tlan           enable driver tlan
++  --enable-via-rhine      enable driver alias via-rhine
++  --enable-viarhine       enable driver viarhine
 +
 +Some influential environment variables:
 +  CC          C compiler command
@@ -9500,7 +9693,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 +echo >confdefs.h
 +
 +# Predefined preprocessor variables.
-+
+ 
 +cat >>confdefs.h <<_ACEOF
 +#define PACKAGE_NAME "$PACKAGE_NAME"
 +_ACEOF
@@ -9530,7 +9723,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
    if test "x$prefix" != xNONE; then
-@@ -852,39 +1156,93 @@
+@@ -852,39 +1342,94 @@
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
@@ -9644,10 +9837,11 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 +
 +
 +
++
  
  
  
-@@ -912,6 +1270,22 @@
+@@ -912,6 +1457,21 @@
  
  
  
@@ -9662,7 +9856,6 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 +
 +
 +
-+
 +          ac_config_headers="$ac_config_headers device-drivers.h"
 +
 +
@@ -9670,7 +9863,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  ac_aux_dir=
  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
    if test -f $ac_dir/install-sh; then
-@@ -929,95 +1303,133 @@
+@@ -929,95 +1489,133 @@
    fi
  done
  if test -z "$ac_aux_dir"; then
@@ -9739,9 +9932,9 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/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
@@ -9754,7 +9947,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/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
@@ -9781,9 +9974,9 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 +cat >>confdefs.h <<\_ACEOF
 +#define CONFIG_M386
 +_ACEOF
++
  
 -      cat >> confdefs.h <<\EOF
-+
 +cat >>confdefs.h <<\_ACEOF
  #define CPU 386
 -EOF
@@ -9799,9 +9992,9 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 +cat >>confdefs.h <<\_ACEOF
 +#define CONFIG_M486
 +_ACEOF
++
  
 -      cat >> confdefs.h <<\EOF
-+
 +cat >>confdefs.h <<\_ACEOF
  #define CPU 486
 -EOF
@@ -9817,9 +10010,9 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 +cat >>confdefs.h <<\_ACEOF
 +#define CONFIG_M586
 +_ACEOF
++
  
 -      cat >> confdefs.h <<\EOF
-+
 +cat >>confdefs.h <<\_ACEOF
  #define CPU 586
 -EOF
@@ -9835,9 +10028,9 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 +cat >>confdefs.h <<\_ACEOF
 +#define CONFIG_M686
 +_ACEOF
++
  
 -      cat >> confdefs.h <<\EOF
-+
 +cat >>confdefs.h <<\_ACEOF
  #define CPU 686
 -EOF
@@ -9849,12 +10042,12 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 +
 + ;;
 +*)
- 
--      cat >> confdefs.h <<\EOF
++
 +cat >>confdefs.h <<\_ACEOF
 +#define CONFIG_M486
 +_ACEOF
-+
+ 
+-      cat >> confdefs.h <<\EOF
 +
 +cat >>confdefs.h <<\_ACEOF
  #define CPU 486
@@ -9866,7 +10059,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  esac
  
  case "$host_cpu" in
-@@ -1026,288 +1438,1088 @@
+@@ -1026,288 +1624,1088 @@
  esac
  
  
@@ -10138,11 +10331,12 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 -  echo "$ac_t""$CC" 1>&6
 +  echo "$as_me:$LINENO: result: $CC" >&5
 +echo "${ECHO_T}$CC" >&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_CC"; then
 +  ac_ct_CC=$CC
@@ -10152,8 +10346,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  echo "$ac_t""no" 1>&6
++else
 +  if test -n "$ac_ct_CC"; then
 +  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 +else
@@ -10180,8 +10373,8 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 +else
 +  echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6
- fi
- 
++fi
++
 +  CC=$ac_ct_CC
 +else
 +  CC="$ac_cv_prog_CC"
@@ -11092,10 +11285,12 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 +done
 +done
 +
-+fi
-+fi
+ fi
+ fi
+-LD="$ac_cv_prog_LD"
 +LD=$ac_cv_prog_LD
-+if test -n "$LD"; then
+ if test -n "$LD"; then
+-  echo "$ac_t""$LD" 1>&6
 +  echo "$as_me:$LINENO: result: $LD" >&5
 +echo "${ECHO_T}$LD" >&6
 +else
@@ -11130,11 +11325,8 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 +done
 +done
 +
- fi
- fi
--LD="$ac_cv_prog_LD"
--if test -n "$LD"; then
--  echo "$ac_t""$LD" 1>&6
++fi
++fi
 +ac_ct_LD=$ac_cv_prog_ac_ct_LD
 +if test -n "$ac_ct_LD"; then
 +  echo "$as_me:$LINENO: result: $ac_ct_LD" >&5
@@ -11152,7 +11344,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  
-@@ -1320,8 +2532,7 @@
+@@ -1320,8 +2718,7 @@
    enableval="$enable_3c501"
    enable_el1="$enable_3c501"
  
@@ -11162,7 +11354,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias 3c503
  # Check whether --enable-3c503 or --disable-3c503 was given.
-@@ -1329,8 +2540,7 @@
+@@ -1329,8 +2726,7 @@
    enableval="$enable_3c503"
    enable_el2="$enable_3c503"
  
@@ -11172,7 +11364,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias 3c509
  # Check whether --enable-3c509 or --disable-3c509 was given.
-@@ -1338,8 +2548,7 @@
+@@ -1338,8 +2734,7 @@
    enableval="$enable_3c509"
    enable_el3="$enable_3c509"
  
@@ -11182,7 +11374,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias 3c579
  # Check whether --enable-3c579 or --disable-3c579 was given.
-@@ -1347,8 +2556,7 @@
+@@ -1347,8 +2742,7 @@
    enableval="$enable_3c579"
    enable_el3="$enable_3c579"
  
@@ -11192,7 +11384,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias 3c59x
  # Check whether --enable-3c59x or --disable-3c59x was given.
-@@ -1356,8 +2564,7 @@
+@@ -1356,8 +2750,7 @@
    enableval="$enable_3c59x"
    enable_vortex="$enable_3c59x"
  
@@ -11202,7 +11394,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias 3c90x
  # Check whether --enable-3c90x or --disable-3c90x was given.
-@@ -1365,8 +2572,7 @@
+@@ -1365,8 +2758,7 @@
    enableval="$enable_3c90x"
    enable_vortex="$enable_3c90x"
  
@@ -11212,7 +11404,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias hpj2577
  # Check whether --enable-hpj2577 or --disable-hpj2577 was given.
-@@ -1374,8 +2580,7 @@
+@@ -1374,8 +2766,7 @@
    enableval="$enable_hpj2577"
    enable_hp100="$enable_hpj2577"
  
@@ -11222,7 +11414,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias hpj2573
  # Check whether --enable-hpj2573 or --disable-hpj2573 was given.
-@@ -1383,8 +2588,7 @@
+@@ -1383,8 +2774,7 @@
    enableval="$enable_hpj2573"
    enable_hp100="$enable_hpj2573"
  
@@ -11232,7 +11424,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias hpj2585
  # Check whether --enable-hpj2585 or --disable-hpj2585 was given.
-@@ -1392,8 +2596,7 @@
+@@ -1392,8 +2782,7 @@
    enableval="$enable_hpj2585"
    enable_hp100="$enable_hpj2585"
  
@@ -11242,7 +11434,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias hp27248b
  # Check whether --enable-hp27248b or --disable-hp27248b was given.
-@@ -1401,8 +2604,7 @@
+@@ -1401,8 +2790,7 @@
    enableval="$enable_hp27248b"
    enable_hp100="$enable_hp27248b"
  
@@ -11252,7 +11444,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias eth32
  # Check whether --enable-eth32 or --disable-eth32 was given.
-@@ -1410,8 +2612,7 @@
+@@ -1410,8 +2798,7 @@
    enableval="$enable_eth32"
    enable_eth16i="$enable_eth32"
  
@@ -11262,7 +11454,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias znote
  # Check whether --enable-znote or --disable-znote was given.
-@@ -1419,8 +2620,7 @@
+@@ -1419,8 +2806,7 @@
    enableval="$enable_znote"
    enable_znet="$enable_znote"
  
@@ -11272,7 +11464,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias de100
  # Check whether --enable-de100 or --disable-de100 was given.
-@@ -1428,8 +2628,7 @@
+@@ -1428,8 +2814,7 @@
    enableval="$enable_de100"
    enable_depca="$enable_de100"
  
@@ -11282,7 +11474,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias de101
  # Check whether --enable-de101 or --disable-de101 was given.
-@@ -1437,8 +2636,7 @@
+@@ -1437,8 +2822,7 @@
    enableval="$enable_de101"
    enable_depca="$enable_de101"
  
@@ -11292,7 +11484,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias de200
  # Check whether --enable-de200 or --disable-de200 was given.
-@@ -1446,8 +2644,7 @@
+@@ -1446,8 +2830,7 @@
    enableval="$enable_de200"
    enable_depca="$enable_de200"
  
@@ -11302,7 +11494,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias de201
  # Check whether --enable-de201 or --disable-de201 was given.
-@@ -1455,8 +2652,7 @@
+@@ -1455,8 +2838,7 @@
    enableval="$enable_de201"
    enable_depca="$enable_de201"
  
@@ -11312,7 +11504,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias de202
  # Check whether --enable-de202 or --disable-de202 was given.
-@@ -1464,8 +2660,7 @@
+@@ -1464,8 +2846,7 @@
    enableval="$enable_de202"
    enable_depca="$enable_de202"
  
@@ -11322,7 +11514,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias de210
  # Check whether --enable-de210 or --disable-de210 was given.
-@@ -1473,8 +2668,7 @@
+@@ -1473,8 +2854,7 @@
    enableval="$enable_de210"
    enable_depca="$enable_de210"
  
@@ -11332,7 +11524,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias de422
  # Check whether --enable-de422 or --disable-de422 was given.
-@@ -1482,8 +2676,7 @@
+@@ -1482,8 +2862,7 @@
    enableval="$enable_de422"
    enable_depca="$enable_de422"
  
@@ -11342,7 +11534,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias de203
  # Check whether --enable-de203 or --disable-de203 was given.
-@@ -1491,8 +2684,7 @@
+@@ -1491,8 +2870,7 @@
    enableval="$enable_de203"
    enable_ewrk3="$enable_de203"
  
@@ -11352,7 +11544,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias de204
  # Check whether --enable-de204 or --disable-de204 was given.
-@@ -1500,8 +2692,7 @@
+@@ -1500,8 +2878,7 @@
    enableval="$enable_de204"
    enable_ewrk3="$enable_de204"
  
@@ -11362,7 +11554,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias de205
  # Check whether --enable-de205 or --disable-de205 was given.
-@@ -1509,8 +2700,7 @@
+@@ -1509,8 +2886,7 @@
    enableval="$enable_de205"
    enable_ewrk3="$enable_de205"
  
@@ -11372,7 +11564,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias de425
  # Check whether --enable-de425 or --disable-de425 was given.
-@@ -1518,8 +2708,7 @@
+@@ -1518,8 +2894,7 @@
    enableval="$enable_de425"
    enable_de4x5="$enable_de425"
  
@@ -11382,7 +11574,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias de434
  # Check whether --enable-de434 or --disable-de434 was given.
-@@ -1527,8 +2716,7 @@
+@@ -1527,8 +2902,7 @@
    enableval="$enable_de434"
    enable_de4x5="$enable_de434"
  
@@ -11392,7 +11584,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias de435
  # Check whether --enable-de435 or --disable-de435 was given.
-@@ -1536,8 +2724,7 @@
+@@ -1536,8 +2910,7 @@
    enableval="$enable_de435"
    enable_de4x5="$enable_de435"
  
@@ -11402,7 +11594,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias de450
  # Check whether --enable-de450 or --disable-de450 was given.
-@@ -1545,8 +2732,7 @@
+@@ -1545,8 +2918,7 @@
    enableval="$enable_de450"
    enable_de4x5="$enable_de450"
  
@@ -11412,7 +11604,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias de500
  # Check whether --enable-de500 or --disable-de500 was given.
-@@ -1554,8 +2740,7 @@
+@@ -1554,8 +2926,7 @@
    enableval="$enable_de500"
    enable_de4x5="$enable_de500"
  
@@ -11422,7 +11614,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias 3c507
  # Check whether --enable-3c507 or --disable-3c507 was given.
-@@ -1563,8 +2748,7 @@
+@@ -1563,8 +2934,7 @@
    enableval="$enable_3c507"
    enable_el16="$enable_3c507"
  
@@ -11432,7 +11624,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias 3c505
  # Check whether --enable-3c505 or --disable-3c505 was given.
-@@ -1572,8 +2756,7 @@
+@@ -1572,8 +2942,7 @@
    enableval="$enable_3c505"
    enable_elplus="$enable_3c505"
  
@@ -11442,7 +11634,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias ne1000
  # Check whether --enable-ne1000 or --disable-ne1000 was given.
-@@ -1581,8 +2764,7 @@
+@@ -1581,8 +2950,7 @@
    enableval="$enable_ne1000"
    enable_ne2000="$enable_ne1000"
  
@@ -11452,7 +11644,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias ne
  # Check whether --enable-ne or --disable-ne was given.
-@@ -1590,8 +2772,7 @@
+@@ -1590,8 +2958,7 @@
    enableval="$enable_ne"
    enable_ne2000="$enable_ne"
  
@@ -11462,7 +11654,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias at1500
  # Check whether --enable-at1500 or --disable-at1500 was given.
-@@ -1599,8 +2780,7 @@
+@@ -1599,8 +2966,7 @@
    enableval="$enable_at1500"
    enable_lance="$enable_at1500"
  
@@ -11472,7 +11664,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias ne2100
  # Check whether --enable-ne2100 or --disable-ne2100 was given.
-@@ -1608,8 +2788,7 @@
+@@ -1608,8 +2974,7 @@
    enableval="$enable_ne2100"
    enable_lance="$enable_ne2100"
  
@@ -11482,7 +11674,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias tulip
  # Check whether --enable-tulip or --disable-tulip was given.
-@@ -1617,8 +2796,7 @@
+@@ -1617,8 +2982,7 @@
    enableval="$enable_tulip"
    enable_elcp="$enable_tulip"
  
@@ -11492,7 +11684,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias rtl8129
  # Check whether --enable-rtl8129 or --disable-rtl8129 was given.
-@@ -1626,8 +2804,7 @@
+@@ -1626,8 +2990,7 @@
    enableval="$enable_rtl8129"
    enable_rtl8139="$enable_rtl8129"
  
@@ -11502,7 +11694,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias aha2825
  # Check whether --enable-aha2825 or --disable-aha2825 was given.
-@@ -1635,8 +2812,7 @@
+@@ -1635,8 +2998,7 @@
    enableval="$enable_aha2825"
    enable_aha152x="$enable_aha2825"
  
@@ -11512,7 +11704,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias ncr53c400
  # Check whether --enable-ncr53c400 or --disable-ncr53c400 was given.
-@@ -1644,8 +2820,7 @@
+@@ -1644,8 +3006,7 @@
    enableval="$enable_ncr53c400"
    enable_ncr5380="$enable_ncr53c400"
  
@@ -11522,7 +11714,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias t128f
  # Check whether --enable-t128f or --disable-t128f was given.
-@@ -1653,8 +2828,7 @@
+@@ -1653,8 +3014,7 @@
    enableval="$enable_t128f"
    enable_t128="$enable_t128f"
  
@@ -11532,7 +11724,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias t228
  # Check whether --enable-t228 or --disable-t228 was given.
-@@ -1662,8 +2836,7 @@
+@@ -1662,8 +3022,7 @@
    enableval="$enable_t228"
    enable_t128="$enable_t228"
  
@@ -11542,7 +11734,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias am79c974
  # Check whether --enable-am79c974 or --disable-am79c974 was given.
-@@ -1671,8 +2844,7 @@
+@@ -1671,8 +3030,7 @@
    enableval="$enable_am79c974"
    enable_am53c974="$enable_am79c974"
  
@@ -11552,7 +11744,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias dtc3180
  # Check whether --enable-dtc3180 or --disable-dtc3180 was given.
-@@ -1680,8 +2852,7 @@
+@@ -1680,8 +3038,7 @@
    enableval="$enable_dtc3180"
    enable_dtc3280="$enable_dtc3180"
  
@@ -11562,7 +11754,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias dc390w
  # Check whether --enable-dc390w or --disable-dc390w was given.
-@@ -1689,8 +2860,7 @@
+@@ -1689,8 +3046,7 @@
    enableval="$enable_dc390w"
    enable_ncr53c8xx="$enable_dc390w"
  
@@ -11572,7 +11764,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias dc390u
  # Check whether --enable-dc390u or --disable-dc390u was given.
-@@ -1698,8 +2868,7 @@
+@@ -1698,8 +3054,7 @@
    enableval="$enable_dc390u"
    enable_ncr53c8xx="$enable_dc390u"
  
@@ -11582,7 +11774,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias dc390f
  # Check whether --enable-dc390f or --disable-dc390f was given.
-@@ -1707,8 +2876,7 @@
+@@ -1707,8 +3062,7 @@
    enableval="$enable_dc390f"
    enable_ncr53c8xx="$enable_dc390f"
  
@@ -11592,7 +11784,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias dc390
  # Check whether --enable-dc390 or --disable-dc390 was given.
-@@ -1716,8 +2884,7 @@
+@@ -1716,8 +3070,7 @@
    enableval="$enable_dc390"
    enable_dc390t="$enable_dc390"
  
@@ -11602,7 +11794,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  # Checking for alias epic100
  # Check whether --enable-epic100 or --disable-epic100 was given.
-@@ -1725,19 +2892,21 @@
+@@ -1725,19 +3078,21 @@
    enableval="$enable_epic100"
    enable_epic="$enable_epic100"
  
@@ -11628,7 +11820,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  
-@@ -1749,46 +2918,50 @@
+@@ -1749,45 +3104,64 @@
  # Check whether --enable-floppy or --disable-floppy was given.
  if test "${enable_floppy+set}" = set; then
    enableval="$enable_floppy"
@@ -11690,12 +11882,25 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  fi
  fi
  
--fi
 +fi;
++
++# Check whether --enable-forcedma or --disable-forcedma was given.
++if test "${enable_forcedma+set}" = set; then
++  enableval="$enable_forcedma"
++  forcedma=$enableval
++else
++  forcedma=no
++fi;
++if test x"$forcedma" = xno; then
++
++cat >>confdefs.h <<\_ACEOF
++#define CONFIG_BLK_DEV_FORCE_DMA
++_ACEOF
++
+ fi
  
  
- 
-@@ -1800,30 +2973,32 @@
+@@ -1800,30 +3174,32 @@
    enableval="$enable_advansys"
    enable_advansys="$enable_advansys"
  
@@ -11737,7 +11942,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias BusLogic
-@@ -1832,30 +3007,32 @@
+@@ -1832,30 +3208,32 @@
    enableval="$enable_BusLogic"
    enable_buslogic="$enable_BusLogic"
  
@@ -11779,7 +11984,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias u14-34f
-@@ -1864,30 +3041,32 @@
+@@ -1864,30 +3242,32 @@
    enableval="$enable_u14_34f"
    enable_u1434f="$enable_u14-34f"
  
@@ -11821,7 +12026,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias ultrastor
-@@ -1896,30 +3075,32 @@
+@@ -1896,30 +3276,32 @@
    enableval="$enable_ultrastor"
    enable_ultrastor="$enable_ultrastor"
  
@@ -11863,7 +12068,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias aha152x
-@@ -1928,30 +3109,32 @@
+@@ -1928,30 +3310,32 @@
    enableval="$enable_aha152x"
    enable_aha152x="$enable_aha152x"
  
@@ -11905,7 +12110,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias aha1542
-@@ -1960,30 +3143,32 @@
+@@ -1960,30 +3344,32 @@
    enableval="$enable_aha1542"
    enable_aha1542="$enable_aha1542"
  
@@ -11947,7 +12152,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias aha1740
-@@ -1992,30 +3177,32 @@
+@@ -1992,30 +3378,32 @@
    enableval="$enable_aha1740"
    enable_aha1740="$enable_aha1740"
  
@@ -11989,7 +12194,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias aic7xxx
-@@ -2024,30 +3211,32 @@
+@@ -2024,30 +3412,32 @@
    enableval="$enable_aic7xxx"
    enable_aic7xxx="$enable_aic7xxx"
  
@@ -12031,7 +12236,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias fdomain
-@@ -2056,30 +3245,32 @@
+@@ -2056,30 +3446,32 @@
    enableval="$enable_fdomain"
    enable_futuredomain="$enable_fdomain"
  
@@ -12073,7 +12278,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias in2000
-@@ -2088,30 +3279,32 @@
+@@ -2088,30 +3480,32 @@
    enableval="$enable_in2000"
    enable_in2000="$enable_in2000"
  
@@ -12115,7 +12320,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias g_NCR5380
-@@ -2120,30 +3313,32 @@
+@@ -2120,30 +3514,32 @@
    enableval="$enable_g_NCR5380"
    enable_ncr5380="$enable_g_NCR5380"
  
@@ -12157,7 +12362,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias NCR53c406a
-@@ -2152,30 +3347,32 @@
+@@ -2152,30 +3548,32 @@
    enableval="$enable_NCR53c406a"
    enable_ncr53c406a="$enable_NCR53c406a"
  
@@ -12199,7 +12404,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias pas16
-@@ -2184,30 +3381,32 @@
+@@ -2184,30 +3582,32 @@
    enableval="$enable_pas16"
    enable_pas16="$enable_pas16"
  
@@ -12241,7 +12446,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias seagate
-@@ -2216,30 +3415,32 @@
+@@ -2216,30 +3616,32 @@
    enableval="$enable_seagate"
    enable_seagate="$enable_seagate"
  
@@ -12283,7 +12488,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias t128
-@@ -2248,30 +3449,32 @@
+@@ -2248,30 +3650,32 @@
    enableval="$enable_t128"
    enable_t128="$enable_t128"
  
@@ -12325,7 +12530,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias 53c78xx
-@@ -2280,30 +3483,32 @@
+@@ -2280,30 +3684,32 @@
    enableval="$enable_53c78xx"
    enable_ncr53c7xx="$enable_53c78xx"
  
@@ -12367,7 +12572,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias eata_dma
-@@ -2312,30 +3517,32 @@
+@@ -2312,30 +3718,32 @@
    enableval="$enable_eata_dma"
    enable_eatadma="$enable_eata_dma"
  
@@ -12409,7 +12614,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias eata_pio
-@@ -2344,30 +3551,32 @@
+@@ -2344,30 +3752,32 @@
    enableval="$enable_eata_pio"
    enable_eatapio="$enable_eata_pio"
  
@@ -12451,7 +12656,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias wd7000
-@@ -2376,30 +3585,32 @@
+@@ -2376,30 +3786,32 @@
    enableval="$enable_wd7000"
    enable_wd7000="$enable_wd7000"
  
@@ -12493,7 +12698,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias eata
-@@ -2408,30 +3619,32 @@
+@@ -2408,30 +3820,32 @@
    enableval="$enable_eata"
    enable_eata="$enable_eata"
  
@@ -12535,7 +12740,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias AM53C974
-@@ -2440,30 +3653,32 @@
+@@ -2440,30 +3854,32 @@
    enableval="$enable_AM53C974"
    enable_am53c974="$enable_AM53C974"
  
@@ -12577,7 +12782,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias dtc
-@@ -2472,30 +3687,32 @@
+@@ -2472,30 +3888,32 @@
    enableval="$enable_dtc"
    enable_dtc3280="$enable_dtc"
  
@@ -12619,7 +12824,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias ncr53c8xx
-@@ -2504,30 +3721,32 @@
+@@ -2504,30 +3922,32 @@
    enableval="$enable_ncr53c8xx"
    enable_ncr53c8xx="$enable_ncr53c8xx"
  
@@ -12661,7 +12866,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias tmscsim
-@@ -2536,30 +3755,32 @@
+@@ -2536,30 +3956,32 @@
    enableval="$enable_tmscsim"
    enable_dc390t="$enable_tmscsim"
  
@@ -12703,7 +12908,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias ppa
-@@ -2568,30 +3789,32 @@
+@@ -2568,62 +3990,66 @@
    enableval="$enable_ppa"
    enable_ppa="$enable_ppa"
  
@@ -12745,12 +12950,14 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias qlogicfas
-@@ -2600,30 +3823,32 @@
+ # Check whether --enable-qlogicfas or --disable-qlogicfas was given.
+ if test "${enable_qlogicfas+set}" = set; then
    enableval="$enable_qlogicfas"
-   enable_qlogicfas="$enable_qlogicfas"
- 
--fi
+-  enable_qlogicfas="$enable_qlogicfas"
 -
+-fi
++  enable_qlogicfas="$enable_qlogicfas"
+ 
 +fi;
  
  # Checking for device driver option qlogicfas
@@ -12787,7 +12994,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias qlogicisp
-@@ -2632,30 +3857,32 @@
+@@ -2632,30 +4058,32 @@
    enableval="$enable_qlogicisp"
    enable_qlogicisp="$enable_qlogicisp"
  
@@ -12829,7 +13036,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias gdth
-@@ -2664,46 +3891,223 @@
+@@ -2664,46 +4092,219 @@
    enableval="$enable_gdth"
    enable_gdth="$enable_gdth"
  
@@ -12877,17 +13084,13 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 -  cat >> confdefs.h <<\EOF
 -#define CONFIG_SCSI_OMIT_FLASHPOINT 1
 -EOF
-+  flashpoint=$enableval
-+else
-+  flashpoint=no
-+fi;
-+if test x"$flashpoint" = xno; then
++  test x"$enableval" = xno &&
 +
 +cat >>confdefs.h <<\_ACEOF
 +#define CONFIG_SCSI_OMIT_FLASHPOINT
 +_ACEOF
 +
-+fi
++fi;
 +
 +
 +
@@ -13067,7 +13270,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  
-@@ -2711,46 +4115,49 @@
+@@ -2711,46 +4312,49 @@
  # Check whether --enable-ne2000 or --disable-ne2000 was given.
  if test "${enable_ne2000+set}" = set; then
    enableval="$enable_ne2000"
@@ -13132,7 +13335,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias 3c509
-@@ -2759,53 +4166,56 @@
+@@ -2759,53 +4363,56 @@
    enableval="$enable_3c509"
    enable_el3="$enable_3c509"
  
@@ -13205,7 +13408,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias 3c501
-@@ -2814,122 +4224,128 @@
+@@ -2814,122 +4421,128 @@
    enableval="$enable_3c501"
    enable_el1="$enable_3c501"
  
@@ -13374,7 +13577,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias 3c59x
-@@ -2938,30 +4354,32 @@
+@@ -2938,30 +4551,32 @@
    enableval="$enable_3c59x"
    enable_vortex="$enable_3c59x"
  
@@ -13416,7 +13619,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias seeq8005
-@@ -2970,30 +4388,32 @@
+@@ -2970,30 +4585,32 @@
    enableval="$enable_seeq8005"
    enable_seeq8005="$enable_seeq8005"
  
@@ -13458,7 +13661,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias hp100
-@@ -3002,76 +4422,80 @@
+@@ -3002,76 +4619,80 @@
    enableval="$enable_hp100"
    enable_hp100="$enable_hp100"
  
@@ -13563,7 +13766,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias at1700
-@@ -3080,30 +4504,32 @@
+@@ -3080,30 +4701,32 @@
    enableval="$enable_at1700"
    enable_at1700="$enable_at1700"
  
@@ -13605,7 +13808,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias eth16i
-@@ -3112,30 +4538,32 @@
+@@ -3112,30 +4735,32 @@
    enableval="$enable_eth16i"
    enable_eth16i="$enable_eth16i"
  
@@ -13647,7 +13850,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias znet
-@@ -3144,30 +4572,32 @@
+@@ -3144,30 +4769,32 @@
    enableval="$enable_znet"
    enable_znet="$enable_znet"
  
@@ -13689,7 +13892,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias eexpress
-@@ -3176,30 +4606,32 @@
+@@ -3176,30 +4803,32 @@
    enableval="$enable_eexpress"
    enable_eexpress="$enable_eexpress"
  
@@ -13731,7 +13934,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias eepro
-@@ -3208,30 +4640,32 @@
+@@ -3208,30 +4837,32 @@
    enableval="$enable_eepro"
    enable_eexpresspro="$enable_eepro"
  
@@ -13773,7 +13976,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias eepro100
-@@ -3240,30 +4674,32 @@
+@@ -3240,30 +4871,32 @@
    enableval="$enable_eepro100"
    enable_eexpresspro100="$enable_eepro100"
  
@@ -13815,7 +14018,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias depca
-@@ -3272,30 +4708,32 @@
+@@ -3272,30 +4905,32 @@
    enableval="$enable_depca"
    enable_depca="$enable_depca"
  
@@ -13857,7 +14060,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias ewrk3
-@@ -3304,30 +4742,32 @@
+@@ -3304,30 +4939,32 @@
    enableval="$enable_ewrk3"
    enable_ewrk3="$enable_ewrk3"
  
@@ -13899,7 +14102,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias de4x5
-@@ -3336,30 +4776,32 @@
+@@ -3336,30 +4973,32 @@
    enableval="$enable_de4x5"
    enable_de4x5="$enable_de4x5"
  
@@ -13941,7 +14144,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias apricot
-@@ -3368,30 +4810,32 @@
+@@ -3368,30 +5007,32 @@
    enableval="$enable_apricot"
    enable_apricot="$enable_apricot"
  
@@ -13983,7 +14186,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias wavelan
-@@ -3400,30 +4844,32 @@
+@@ -3400,30 +5041,32 @@
    enableval="$enable_wavelan"
    enable_wavelan="$enable_wavelan"
  
@@ -14025,7 +14228,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias 3c507
-@@ -3432,30 +4878,32 @@
+@@ -3432,30 +5075,32 @@
    enableval="$enable_3c507"
    enable_el16="$enable_3c507"
  
@@ -14067,7 +14270,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias 3c505
-@@ -3464,30 +4912,32 @@
+@@ -3464,30 +5109,32 @@
    enableval="$enable_3c505"
    enable_elplus="$enable_3c505"
  
@@ -14109,7 +14312,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias de600
-@@ -3496,30 +4946,32 @@
+@@ -3496,30 +5143,32 @@
    enableval="$enable_de600"
    enable_de600="$enable_de600"
  
@@ -14151,7 +14354,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias de620
-@@ -3528,30 +4980,32 @@
+@@ -3528,30 +5177,32 @@
    enableval="$enable_de620"
    enable_de620="$enable_de620"
  
@@ -14193,7 +14396,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias sk_g16
-@@ -3560,30 +5014,32 @@
+@@ -3560,30 +5211,32 @@
    enableval="$enable_sk_g16"
    enable_skg16="$enable_sk_g16"
  
@@ -14235,7 +14438,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias ni52
-@@ -3592,30 +5048,32 @@
+@@ -3592,30 +5245,32 @@
    enableval="$enable_ni52"
    enable_ni52="$enable_ni52"
  
@@ -14277,7 +14480,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias ni65
-@@ -3624,30 +5082,32 @@
+@@ -3624,30 +5279,32 @@
    enableval="$enable_ni65"
    enable_ni65="$enable_ni65"
  
@@ -14319,7 +14522,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias atp
-@@ -3656,30 +5116,32 @@
+@@ -3656,30 +5313,32 @@
    enableval="$enable_atp"
    enable_atp="$enable_atp"
  
@@ -14361,7 +14564,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias lance
-@@ -3688,30 +5150,32 @@
+@@ -3688,30 +5347,32 @@
    enableval="$enable_lance"
    enable_lance="$enable_lance"
  
@@ -14403,7 +14606,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias tulip
-@@ -3720,30 +5184,32 @@
+@@ -3720,30 +5381,32 @@
    enableval="$enable_tulip"
    enable_elcp="$enable_tulip"
  
@@ -14445,7 +14648,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias fmv18x
-@@ -3752,30 +5218,32 @@
+@@ -3752,30 +5415,32 @@
    enableval="$enable_fmv18x"
    enable_fmv18x="$enable_fmv18x"
  
@@ -14487,7 +14690,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias 3c515
-@@ -3784,30 +5252,32 @@
+@@ -3784,30 +5449,32 @@
    enableval="$enable_3c515"
    enable_3c515="$enable_3c515"
  
@@ -14529,7 +14732,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias pcnet32
-@@ -3816,53 +5286,56 @@
+@@ -3816,53 +5483,56 @@
    enableval="$enable_pcnet32"
    enable_pcnet32="$enable_pcnet32"
  
@@ -14602,7 +14805,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias yellowfin
-@@ -3871,30 +5344,32 @@
+@@ -3871,30 +5541,32 @@
    enableval="$enable_yellowfin"
    enable_yellowfin="$enable_yellowfin"
  
@@ -14644,7 +14847,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias rtl8139
-@@ -3903,30 +5378,32 @@
+@@ -3903,30 +5575,32 @@
    enableval="$enable_rtl8139"
    enable_rtl8139="$enable_rtl8139"
  
@@ -14686,7 +14889,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias epic100
-@@ -3935,30 +5412,32 @@
+@@ -3935,30 +5609,32 @@
    enableval="$enable_epic100"
    enable_epic="$enable_epic100"
  
@@ -14728,7 +14931,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias tlan
-@@ -3967,30 +5446,32 @@
+@@ -3967,30 +5643,32 @@
    enableval="$enable_tlan"
    enable_tlan="$enable_tlan"
  
@@ -14770,7 +14973,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
  
  
  # Checking for alias via-rhine
-@@ -3999,389 +5480,1150 @@
+@@ -3999,389 +5677,1150 @@
    enableval="$enable_via_rhine"
    enable_viarhine="$enable_via-rhine"
  
@@ -16215,10 +16418,10 @@ diff -Naur gnumach-20040229.orig/i386/linux/configure gnumach-20040229/i386/linu
 +  $ac_cs_success || { (exit 1); exit 1; }
 +fi
  
-diff -Naur gnumach-20040229.orig/i386/linux/device-drivers.h.in gnumach-20040229/i386/linux/device-drivers.h.in
---- gnumach-20040229.orig/i386/linux/device-drivers.h.in	2004-02-29 21:28:09.000000000 +0100
-+++ gnumach-20040229/i386/linux/device-drivers.h.in	2004-09-15 13:48:38.000000000 +0200
-@@ -1,84 +1,271 @@
+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 21:49:29.000000000 +0200
++++ gnumach-20040915/i386/linux/device-drivers.h.in	2004-09-18 21:52:28.000000000 +0200
+@@ -1,85 +1,274 @@
 -/* All possible device drivers; must match Drivers.in. */
 +/* device-drivers.h.in.  Generated from configure.ac by autoheader.  */
  
@@ -16240,6 +16443,9 @@ diff -Naur gnumach-20040229.orig/i386/linux/device-drivers.h.in gnumach-20040229
 +/* floppy */
 +#undef CONFIG_BLK_DEV_FD
 +
++/* Force DMA on block devices */
++#undef CONFIG_BLK_DEV_FORCE_DMA
++
 +/* ide */
 +#undef CONFIG_BLK_DEV_IDE
 +
@@ -16340,6 +16546,7 @@ diff -Naur gnumach-20040229.orig/i386/linux/device-drivers.h.in gnumach-20040229
 -#undef CONFIG_INET
 -#undef CONFIG_BLK_DEV_FD
 -#undef CONFIG_BLK_DEV_IDE
+-#undef CONFIG_BLK_DEV_FORCE_DMA
 +
 +/* ne2000 */
 +#undef CONFIG_NE2000
@@ -16551,9 +16758,9 @@ diff -Naur gnumach-20040229.orig/i386/linux/device-drivers.h.in gnumach-20040229
 +
 +/* Define to the version of this package. */
 +#undef PACKAGE_VERSION
-diff -Naur gnumach-20040229.orig/linux/aclocal.m4 gnumach-20040229/linux/aclocal.m4
---- gnumach-20040229.orig/linux/aclocal.m4	1970-01-01 01:00:00.000000000 +0100
-+++ gnumach-20040229/linux/aclocal.m4	2004-09-15 13:47:54.000000000 +0200
+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 21:51:37.000000000 +0200
 @@ -0,0 +1,14 @@
 +# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
 +
@@ -16569,9 +16776,9 @@ diff -Naur gnumach-20040229.orig/linux/aclocal.m4 gnumach-20040229/linux/aclocal
 +# PARTICULAR PURPOSE.
 +
 +m4_include([../aclocal.m4])
-diff -Naur gnumach-20040229.orig/linux/configure gnumach-20040229/linux/configure
---- gnumach-20040229.orig/linux/configure	2004-03-01 00:26:39.000000000 +0100
-+++ gnumach-20040229/linux/configure	2004-09-15 13:48:00.000000000 +0200
+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 21:51:43.000000000 +0200
 @@ -1,26 +1,288 @@
  #! /bin/sh
 -