summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <tschwinge@gnu.org>2006-07-27 09:50:07 +0000
committerThomas Schwinge <tschwinge@gnu.org>2009-06-18 00:26:40 +0200
commit1ecc8fb127f5263b3d2984a521b2cfa972221b21 (patch)
treeb5b738c4ef8399df90487aa3e33f22bf76e33dc7
parent660d3fbf4c1b401dd864cdb48b4c184797eee847 (diff)
2006-07-27 Thomas Schwinge <tschwinge@gnu.org>
* i386/linux/configure.ac: Pull in the pcmcia code only if really needed.
-rw-r--r--ChangeLog3
-rw-r--r--i386/linux/configure.ac22
2 files changed, 14 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index af2ff02..027ef7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2006-07-27 Thomas Schwinge <tschwinge@gnu.org>
+ * i386/linux/configure.ac: Pull in the pcmcia code only if really
+ needed.
+
* doc/mach.texi (Configuration): Very briefly document the new drivers.
* i386/README-Drivers: Likewise.
diff --git a/i386/linux/configure.ac b/i386/linux/configure.ac
index 5c5dfc0..0e37013 100644
--- a/i386/linux/configure.ac
+++ b/i386/linux/configure.ac
@@ -244,24 +244,24 @@ AC_DRIVER([pcnet_cs], [CONFIG_PCNET_CS], [pcnet_cs.o 8390.o], [pcmcia])
linux_DRIVER([smc91c92_cs], [SMC91C92_CS], [smc91c92_cs], [pcmcia])
linux_DRIVER([xirc2ps_cs], [XIRC2PS_CS], [xirc2ps_cs], [pcmcia])
-dnl Wireless device support.
+dnl Wireless device drivers.
+
+AC_DRIVER([orinoco_cs], [CONFIG_ORINOCO_CS], [ \
+ hermes.o orinoco.o orinoco_cs.o], [wireless])
-AC_DEFUN([AC_WIRELESS_CS_DRIVER], [
- AC_DRIVER([$1], [CONFIG_$2], [$3], [wireless])
+
+dnl If any pcmcia wireless devices have been enabled, make sure to include the
+dnl pcmcia glue as well.
+if test x"${driver_class_wireless_selected+set}" = xset; then
if test x"${driver_class_pcmcia_selected+set}" != xset; then
driver_class_pcmcia_selected=yes
AC_DEFINE_UNQUOTED([$driver_class_pcmcia_option], [1])
device_drivers="$device_drivers $driver_class_pcmcia_files"
fi
-])
-
-dnl Wireless device drivers.
-
-AC_WIRELESS_CS_DRIVER([orinoco_cs], [ORINOCO_CS], [ \
- hermes.o orinoco.o orinoco_cs.o])
+fi
-dnl If any PCMCIA devices have been enabled, make sure to include the network
-dnl glue as well...
+dnl If any pcmcia devices have been enabled, make sure to include the network
+dnl glue as well.
if test x"${driver_class_pcmcia_selected+set}" = xset; then
if test x"${driver_class_net_selected+set}" != xset; then
driver_class_net_selected=yes