From 5ccc7791cd3ea06c70af61cf5a580e06b10bcc37 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Wed, 2 May 2007 19:47:11 +0000
Subject: 2007-05-02 Thomas Schwinge <tschwinge@gnu.org>
* configure.ac (--disable-default-device-drivers): Transform into...
(--enable-device-drivers): ... this new option and extend it.
* i386/configfrag.ac (--enable-lpr): Adapt to that.
* linux/configfrag.ac (AC_OPTION_Linux_ix86_at, AC_Linux_DRIVER):
Likewise.
(AC_Linux_DRIVER_qemu): New definition. Use it for the `floppy', `ide'
and `ne' device drivers.
* doc/mach.texi: Document all that.
---
linux/configfrag.ac | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
(limited to 'linux')
diff --git a/linux/configfrag.ac b/linux/configfrag.ac
index 5c0237ed..9c51235d 100644
--- a/linux/configfrag.ac
+++ b/linux/configfrag.ac
@@ -61,11 +61,16 @@ dnl USE OF THIS SOFTWARE.
AC_DEFUN([AC_OPTION_Linux_ix86_at], [
[unset enableval]
AC_ARG_ENABLE([$1],
- AS_HELP_STRING([--enable-$1], [$2; enabled by default for ix86-at]))
-[#TODO.
+ AS_HELP_STRING([--enable-$1], [$2]))
+[#TODO. Could use some M4 magic to avoid a lot of shell code.
case $host_platform:$host_cpu in
at:i?86)
- enableval=${enableval-$enable_default_device_drivers};;
+ case $enable_device_drivers:'$2' in
+ default:*by\ default* | qemu:*for\ qemu*)
+ enableval=${enableval-yes};;
+ *)
+ enableval=${enableval-no};;
+ esac;;
*)
if [ x"$enableval" = xyes ]; then
# TODO. That might not always be true.]
@@ -108,10 +113,16 @@ fi]])
#
# AC_Linux_DRIVER(machname, description, definition, [group]). Convenience.
+# TODO. The naming of those is nearly everything but reasonable.
#
AC_DEFUN([AC_Linux_DRIVER], [
- AC_OPTION_Linux_ix86_at([$1], [Linux device driver for $2], [$3], [$4])
+ AC_OPTION_Linux_ix86_at([$1], [Linux device driver for $2; on ix86-at enabled]
+ [by default], [$3], [$4])
+])
+AC_DEFUN([AC_Linux_DRIVER_qemu], [
+ AC_OPTION_Linux_ix86_at([$1], [Linux device driver for $2; on ix86-at enabled]
+ [by default and for qemu], [$3], [$4])
])
AC_DEFUN([AC_Linux_DRIVER_nodef], [
AC_OPTION_Linux_ix86_at_nodef([$1], [Linux device driver for $2], [$3], [$4])
@@ -121,11 +132,11 @@ AC_DEFUN([AC_Linux_DRIVER_nodef], [
# Configuration options.
#
-AC_Linux_DRIVER([floppy],
+AC_Linux_DRIVER_qemu([floppy],
[PC floppy],
[CONFIG_BLK_DEV_FD])
-AC_Linux_DRIVER([ide],
+AC_Linux_DRIVER_qemu([ide],
[IDE disk controllers],
[CONFIG_BLK_DEV_IDE])
@@ -388,7 +399,7 @@ AC_Linux_DRIVER([natsemi],
[Ethernet controller National Semiconductor DP8381x series PCI Ethernet],
[CONFIG_NATSEMI],
[net])
-AC_Linux_DRIVER([ne],
+AC_Linux_DRIVER_qemu([ne],
[Ethernet controller NE2000/NE1000 ISA (ne, ne1000, ne2000)],
[CONFIG_NE2000],
[net])
@@ -482,7 +493,7 @@ AC_Linux_DRIVER([i82365],
[pcmcia])
AC_OPTION_Linux_ix86_at([pcmcia-isa],
- [isa bus support in the pcmcia core],
+ [isa bus support in the pcmcia core; on ix86-at enabled by default],
[CONFIG_ISA],
[pcmcia])
--
cgit v1.2.3