--- Gnu-Mach/i386/configure	2020/09/02 04:36:57	1.1.1.1
+++ Gnu-Mach/i386/configure	2020/09/02 04:39:53	1.1.1.3
@@ -171,6 +171,8 @@ ac_help="$ac_help
 "
 ac_help="$ac_help
 "
+ac_help="$ac_help
+"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -698,6 +700,7 @@ fi
 
 
 
+
 # Checking for alias 3c501
 # Check whether --enable-3c501 or --disable-3c501 was given.
 if test "${enable_3c501+set}" = set; then
@@ -716,6 +719,15 @@ if test "${enable_3c503+set}" = set; the
 fi
 
 
+# Checking for alias 3c509
+# Check whether --enable-3c509 or --disable-3c509 was given.
+if test "${enable_3c509+set}" = set; then
+  enableval="$enable_3c509"
+  enable_el3="$enable_3c509"
+
+fi
+
+
 # Checking for alias 3c59x
 # Check whether --enable-3c59x or --disable-3c59x was given.
 if test "${enable_3c59x+set}" = set; then
@@ -939,29 +951,6 @@ driver_class_net_files="linux_net.o Spac
 
 
 
-# Checking for device driver option com
-# Check whether --enable-com or --disable-com was given.
-if test "${enable_com+set}" = set; then
-  enableval="$enable_com"
-  cat >> confdefs.h <<\EOF
-#define CONFIG_MACH_COM 1
-EOF
-
-device_drivers="$device_drivers com.o"
-if test "driver_class__selected+set" != set; then
-  driver_class__selected=yes
-  cat >> confdefs.h <<EOF
-#define $driver_class__option 1
-EOF
-
-  device_drivers="$device_drivers $driver_class__files"
-fi
-
-fi
-
-
-
-
 
 # Checking for device driver option floppy
 # Check whether --enable-floppy or --disable-floppy was given.
@@ -972,7 +961,7 @@ if test "${enable_floppy+set}" = set; th
 EOF
 
 device_drivers="$device_drivers floppy.o"
-if test "driver_class__selected+set" != set; then
+if test "${driver_class__selected+set}" != set; then
   driver_class__selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class__option 1
@@ -993,7 +982,7 @@ if test "${enable_ide+set}" = set; then
 EOF
 
 device_drivers="$device_drivers cmd640.o ide-cd.o ide.o rz1000.o triton.o"
-if test "driver_class__selected+set" != set; then
+if test "${driver_class__selected+set}" != set; then
   driver_class__selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class__option 1
@@ -1017,7 +1006,7 @@ if test "${enable_advansys+set}" = set;
 EOF
 
 device_drivers="$device_drivers advansys.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1038,7 +1027,7 @@ if test "${enable_buslogic+set}" = set;
 EOF
 
 device_drivers="$device_drivers BusLogic.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1059,7 +1048,7 @@ if test "${enable_u1434f+set}" = set; th
 EOF
 
 device_drivers="$device_drivers u14-34f.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1080,7 +1069,7 @@ if test "${enable_ultrastor+set}" = set;
 EOF
 
 device_drivers="$device_drivers ultrastor.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1101,7 +1090,7 @@ if test "${enable_aha152x+set}" = set; t
 EOF
 
 device_drivers="$device_drivers aha152x.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1122,7 +1111,7 @@ if test "${enable_aha1542+set}" = set; t
 EOF
 
 device_drivers="$device_drivers aha1542.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1143,7 +1132,7 @@ if test "${enable_aha1740+set}" = set; t
 EOF
 
 device_drivers="$device_drivers aha1740.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1164,7 +1153,7 @@ if test "${enable_aic7xxx+set}" = set; t
 EOF
 
 device_drivers="$device_drivers aic7xxx.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1185,7 +1174,7 @@ if test "${enable_futuredomain+set}" = s
 EOF
 
 device_drivers="$device_drivers fdomain.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1206,7 +1195,7 @@ if test "${enable_in2000+set}" = set; th
 EOF
 
 device_drivers="$device_drivers in2000.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1227,7 +1216,7 @@ if test "${enable_ncr5380+set}" = set; t
 EOF
 
 device_drivers="$device_drivers g_NCR5380.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1248,7 +1237,7 @@ if test "${enable_ncr53c406a+set}" = set
 EOF
 
 device_drivers="$device_drivers NCR53c406a.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1269,7 +1258,7 @@ if test "${enable_qlogic+set}" = set; th
 EOF
 
 device_drivers="$device_drivers qlogic.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1290,7 +1279,7 @@ if test "${enable_pas16+set}" = set; the
 EOF
 
 device_drivers="$device_drivers pas16.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1311,7 +1300,7 @@ if test "${enable_seagate+set}" = set; t
 EOF
 
 device_drivers="$device_drivers seagate.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1332,7 +1321,7 @@ if test "${enable_t128+set}" = set; then
 EOF
 
 device_drivers="$device_drivers t128.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1352,14 +1341,14 @@ if test "${enable_ncr53c7xx+set}" = set;
 #define CONFIG_SCSI_NCR53C7xx 1
 EOF
 
-device_drivers="$device_drivers 53c7"
-if test "driver_class_8xx.o_selected+set" != set; then
-  driver_class_8xx.o_selected=yes
+device_drivers="$device_drivers 53c78xx.o"
+if test "${driver_class_scsi_selected+set}" != set; then
+  driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
-#define $driver_class_8xx.o_option 1
+#define $driver_class_scsi_option 1
 EOF
 
-  device_drivers="$device_drivers $driver_class_8xx.o_files"
+  device_drivers="$device_drivers $driver_class_scsi_files"
 fi
 
 fi
@@ -1374,7 +1363,7 @@ if test "${enable_eatadma+set}" = set; t
 EOF
 
 device_drivers="$device_drivers eata_dma.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1395,7 +1384,7 @@ if test "${enable_eatapio+set}" = set; t
 EOF
 
 device_drivers="$device_drivers eata_pio.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1416,7 +1405,7 @@ if test "${enable_wd7000+set}" = set; th
 EOF
 
 device_drivers="$device_drivers wd7000.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1437,7 +1426,7 @@ if test "${enable_eata+set}" = set; then
 EOF
 
 device_drivers="$device_drivers eata.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1458,7 +1447,7 @@ if test "${enable_am53c974+set}" = set;
 EOF
 
 device_drivers="$device_drivers AM53C974.o"
-if test "driver_class_scsi_selected+set" != set; then
+if test "${driver_class_scsi_selected+set}" != set; then
   driver_class_scsi_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_scsi_option 1
@@ -1473,6 +1462,27 @@ fi
 
 
 
+# Checking for device driver option el3
+# Check whether --enable-el3 or --disable-el3 was given.
+if test "${enable_el3+set}" = set; then
+  enableval="$enable_el3"
+  cat >> confdefs.h <<\EOF
+#define CONFIG_EL3 1
+EOF
+
+device_drivers="$device_drivers 3c509.o"
+if test "${driver_class_net_selected+set}" != set; then
+  driver_class_net_selected=yes
+  cat >> confdefs.h <<EOF
+#define $driver_class_net_option 1
+EOF
+
+  device_drivers="$device_drivers $driver_class_net_files"
+fi
+
+fi
+
+
 # Checking for device driver option ne2000
 # Check whether --enable-ne2000 or --disable-ne2000 was given.
 if test "${enable_ne2000+set}" = set; then
@@ -1482,7 +1492,7 @@ if test "${enable_ne2000+set}" = set; th
 EOF
 
 device_drivers="$device_drivers ne.o 8390.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1502,8 +1512,8 @@ if test "${enable_el2+set}" = set; then
 #define CONFIG_EL2 1
 EOF
 
-device_drivers="$device_drivers 3c403.o 8390.o"
-if test "driver_class_net_selected+set" != set; then
+device_drivers="$device_drivers 3c503.o 8390.o"
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1524,7 +1534,7 @@ if test "${enable_wd80x3+set}" = set; th
 EOF
 
 device_drivers="$device_drivers wd.o 8390.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1545,7 +1555,7 @@ if test "${enable_el1+set}" = set; then
 EOF
 
 device_drivers="$device_drivers 3c501.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1566,7 +1576,7 @@ if test "${enable_ul+set}" = set; then
 EOF
 
 device_drivers="$device_drivers smc-ultra.o 8390.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1587,7 +1597,7 @@ if test "${enable_hplanplus+set}" = set;
 EOF
 
 device_drivers="$device_drivers hp-plus.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1608,7 +1618,7 @@ if test "${enable_hplan+set}" = set; the
 EOF
 
 device_drivers="$device_drivers hp.o 8390.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1629,7 +1639,7 @@ if test "${enable_vortex+set}" = set; th
 EOF
 
 device_drivers="$device_drivers 3c59x.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1650,7 +1660,7 @@ if test "${enable_seeq8005+set}" = set;
 EOF
 
 device_drivers="$device_drivers seeq8005.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1671,7 +1681,7 @@ if test "${enable_hp100+set}" = set; the
 EOF
 
 device_drivers="$device_drivers hp100.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1692,7 +1702,7 @@ if test "${enable_ac3200+set}" = set; th
 EOF
 
 device_drivers="$device_drivers ac3200.o 8390.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1713,7 +1723,7 @@ if test "${enable_e2100+set}" = set; the
 EOF
 
 device_drivers="$device_drivers e2100.o 8390.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1734,7 +1744,7 @@ if test "${enable_at1700+set}" = set; th
 EOF
 
 device_drivers="$device_drivers at1700.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1755,7 +1765,7 @@ if test "${enable_eth16i+set}" = set; th
 EOF
 
 device_drivers="$device_drivers eth16i.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1776,7 +1786,7 @@ if test "${enable_znet+set}" = set; then
 EOF
 
 device_drivers="$device_drivers znet.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1797,7 +1807,7 @@ if test "${enable_eexpress+set}" = set;
 EOF
 
 device_drivers="$device_drivers eexpress.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1818,7 +1828,7 @@ if test "${enable_eexpresspro+set}" = se
 EOF
 
 device_drivers="$device_drivers eepro.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1839,7 +1849,7 @@ if test "${enable_depca+set}" = set; the
 EOF
 
 device_drivers="$device_drivers depca.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1860,7 +1870,7 @@ if test "${enable_ewrk3+set}" = set; the
 EOF
 
 device_drivers="$device_drivers ewrk3.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1881,7 +1891,7 @@ if test "${enable_de4x5+set}" = set; the
 EOF
 
 device_drivers="$device_drivers de4x5.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1902,7 +1912,7 @@ if test "${enable_apricot+set}" = set; t
 EOF
 
 device_drivers="$device_drivers apricot.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1923,7 +1933,7 @@ if test "${enable_wavelan+set}" = set; t
 EOF
 
 device_drivers="$device_drivers wavelan.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1944,7 +1954,7 @@ if test "${enable_el16+set}" = set; then
 EOF
 
 device_drivers="$device_drivers 3c507.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1965,7 +1975,7 @@ if test "${enable_elplus+set}" = set; th
 EOF
 
 device_drivers="$device_drivers 3c505.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -1986,7 +1996,7 @@ if test "${enable_de600+set}" = set; the
 EOF
 
 device_drivers="$device_drivers de600.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -2007,7 +2017,7 @@ if test "${enable_de620+set}" = set; the
 EOF
 
 device_drivers="$device_drivers de620.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -2028,7 +2038,7 @@ if test "${enable_skg16+set}" = set; the
 EOF
 
 device_drivers="$device_drivers sk_g16.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -2049,7 +2059,7 @@ if test "${enable_ni52+set}" = set; then
 EOF
 
 device_drivers="$device_drivers ni52.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -2070,7 +2080,7 @@ if test "${enable_ni65+set}" = set; then
 EOF
 
 device_drivers="$device_drivers ni65.o"
-if test "driver_class_net_selected+set" != set; then
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1
@@ -2090,8 +2100,8 @@ if test "${enable_atp+set}" = set; then
 #define CONFIG_ATP 1
 EOF
 
-device_drivers="$device_drivers apt.o"
-if test "driver_class_net_selected+set" != set; then
+device_drivers="$device_drivers atp.o"
+if test "${driver_class_net_selected+set}" != set; then
   driver_class_net_selected=yes
   cat >> confdefs.h <<EOF
 #define $driver_class_net_option 1