2007-02-19 Thomas Schwinge <tschwinge@gnu.org>

Add a `--enable-platform' option for future use.  Allow building
	without any Linux code.
	* Makefile.am: Don't include `linux/Makefrag.am' in there...
	* Makefrag.am: ... but rather in here.
	* configfrag.ac (MACH_MACHINE_ROUTINES): AC_DEFINE_UNQUOTED based on
	then shell variable `mach_machine_routines'.
	(--disable-default-device-drivers): Don't define in there...
	* configure.ac: ... but rather in here.
	(--enable-platform): New option.
	(host_platform): New variable.
	(HOST_i386): Don't define there...
	* i386/configfrag.ac (HOST_ix86): ... but rather here, rename it and
	adapt all users.
	(PLATFORM_at): New conditional.
	(MACH_MACHINE_ROUTINES): Don't AC_DEFINE, but rather set a shell
	variable `mach_machine_routines'.
	* linux/Makefrag.am (noinst_LIBRARIES, gnumach_o_LDADD): Only enhance
	``if CODE_linux'' or ``if device_driver_group_pcmcia''.
	* linux/configfrag.ac (AC_OPTION): Rename to `AC_OPTION_Linux_ix86_at'
	and rework a bit.  Adapt all users.
	(AC_OPTION_nodef): Rename to `AC_OPTION_Linux_ix86_at_nodef' and rework
	a bit.  Adapt all users.
	(CODE_linux): New conditional.
	* i386/Makefrag.am (LINKFLAGS_gnumach): Don't evaluate $(systype).

	* Makefile.am: Update the FSF's postal address.
	* doc/Makefrag.am: Likewise.
	* i386/linux/Makefrag.am: Likewise.
	* linux/Makefrag.am: Likewise.
	* tests/Makefrag.am: Likewise.
	* tests/configfrag.ac: Move to GPL.

2 files changed, 107 insertions, 71 deletions

diff --git a/linux/Makefrag.am b/linux/Makefrag.am
index 0fd21d0..8fd3cc0 100644
--- a/linux/Makefrag.am
+++ b/linux/Makefrag.am
@@ -1,29 +1,31 @@
 # Makefile fragment for Linux device drivers and the glue code.
 
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version.
+# 
 # This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 #
 # Files for device driver support.
 #
 
+if CODE_linux
 noinst_LIBRARIES += \
 	liblinux.a
 gnumach_o_LDADD += \
 	liblinux.a
+endif
 
 liblinux_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(srcdir)/$(systype)/linux/dev/include \
@@ -608,12 +610,13 @@ liblinux_pcmcia_cs_modules_a_CPPFLAGS = $(liblinux_a_CPPFLAGS) \
 liblinux_pcmcia_cs_modules_a_CFLAGS = $(liblinux_a_CFLAGS) \
 	-include $(srcdir)/linux/pcmcia-cs/glue/pcmcia_glue.h
 liblinux_pcmcia_cs_modules_a_SOURCES =
+if device_driver_group_pcmcia
 noinst_LIBRARIES += \
 	liblinux_pcmcia_cs_modules.a
 gnumach_o_LDADD += \
 	liblinux_pcmcia_cs_modules.a
+endif
 
-if device_driver_group_pcmcia
 liblinux_pcmcia_cs_modules_a_SOURCES += \
 	linux/pcmcia-cs/glue/pcmcia.c \
 	linux/pcmcia-cs/glue/pcmcia_glue.h \
@@ -626,7 +629,6 @@ liblinux_pcmcia_cs_modules_a_SOURCES += \
 	linux/pcmcia-cs/modules/pci_fixup.c
 EXTRA_DIST += \
 	linux/pcmcia-cs/glue/ds.c
-endif
 
 if device_driver_i82365
 liblinux_pcmcia_cs_modules_a_SOURCES += \
@@ -648,10 +650,12 @@ liblinux_pcmcia_cs_clients_a_CPPFLAGS = $(liblinux_a_CPPFLAGS) \
 liblinux_pcmcia_cs_clients_a_CFLAGS = $(liblinux_a_CFLAGS) \
 	-include $(srcdir)/linux/pcmcia-cs/glue/pcmcia_glue.h
 liblinux_pcmcia_cs_clients_a_SOURCES =
+if device_driver_group_pcmcia
 noinst_LIBRARIES += \
 	liblinux_pcmcia_cs_clients.a
 gnumach_o_LDADD += \
 	liblinux_pcmcia_cs_clients.a
+endif
 
 if device_driver_3c574_cs
 liblinux_pcmcia_cs_clients_a_SOURCES += \
@@ -701,10 +705,12 @@ liblinux_pcmcia_cs_wireless_a_CPPFLAGS = $(liblinux_a_CPPFLAGS) \
 liblinux_pcmcia_cs_wireless_a_CFLAGS = $(liblinux_a_CFLAGS) \
 	-include $(srcdir)/linux/pcmcia-cs/glue/wireless_glue.h
 liblinux_pcmcia_cs_wireless_a_SOURCES =
+if device_driver_group_pcmcia
 noinst_LIBRARIES += \
 	liblinux_pcmcia_cs_wireless.a
 gnumach_o_LDADD += \
 	liblinux_pcmcia_cs_wireless.a
+endif
 
 if device_driver_orinoco_cs
 liblinux_pcmcia_cs_wireless_a_SOURCES += \
@@ -745,6 +751,6 @@ dist-hook-linux:
 # Architecture specific parts.
 #
 
-if HOST_i386
+if HOST_ix86
 include i386/linux/Makefrag.am
 endif
diff --git a/linux/configfrag.ac b/linux/configfrag.ac
index 648f109..5c0237e 100644
--- a/linux/configfrag.ac
+++ b/linux/configfrag.ac
@@ -1,6 +1,6 @@
 dnl Configure fragment for Linux code snarfed into GNU Mach.
 
-dnl Copyright 1997, 1999, 2004, 2006 Free Software Foundation, Inc.
+dnl Copyright (C) 1997, 1999, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 dnl Permission to use, copy, modify and distribute this software and its
 dnl documentation is hereby granted, provided that both the copyright
@@ -14,32 +14,10 @@ dnl LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE
 dnl USE OF THIS SOFTWARE.
 
 #
-# Which host CPU?
+# Internals.
 #
 
-AC_DEFUN([hurd_host_CPU], [
-  AC_DEFINE([CONFIG_M$1], [1], [$1])
-  AC_DEFINE([CPU], [$1], [CPU])
-])
-
-[if [ x"$systype" = xi386 ]; then
-  case "$host_cpu" in
-    i386)] hurd_host_CPU([386])[;;
-    i486)] hurd_host_CPU([486])[;;
-    i586)] hurd_host_CPU([586])[;;
-    i686)] hurd_host_CPU([686])[;;
-    *)] hurd_host_CPU([486])[;;
-  esac
-fi]
-
-#
-# Definitions.
-#
-
-# The glue code dependend code checks for this.
-AC_DEFINE([LINUX_DEV], [1], [Linux device drivers.])
-# Instead of Mach's KERNEL, Linux uses __KERNEL__.  Whee.
-AC_DEFINE([__KERNEL__], [1], [__KERNEL__])
+[have_linux_code=no]
 
 #
 # Helper functions.
@@ -50,7 +28,7 @@ AC_DEFINE([__KERNEL__], [1], [__KERNEL__])
 # for the group `group' will be set-up.
 #
 
-device_driver_group() {
+[device_driver_group() {
   case $1 in
     '')
       # No group.
@@ -67,44 +45,63 @@ device_driver_group() {
       # Pull in group `pcmcia'.
       device_driver_group pcmcia
       device_driver_group_wireless=selected;;
-    *)
-      AC_MSG_ERROR([invalid device driver group `$1']);;
+    *)]
+      AC_MSG_ERROR([invalid device driver group `$1'])[;;
   esac
-}
+}]
 
 #
-# AC_OPTION(name,description,option[,class]).  Process configuration option
-# --enable-`name' (with description `description').  If it's set, then `option'
-# is defined with AC_DEFINE.  The option optionally pulls in group `group'; see
-# the comments on device_driver_group for more information.  By default, the
-# value from $enable_default_device_drivers is considered when deciding whether
-# to activate the option by default or not.
+# AC_OPTION_Linux_ix86_at(name,description,option[,class]).  Process
+# configuration option --enable-`name' (with description `description').  If
+# it's set, then `option' is defined with AC_DEFINE.  The option optionally
+# pulls in group `group'; see the comments on device_driver_group for more
+# information.  For ix86-at, the value from $enable_default_device_drivers is
+# considered when deciding whether to activate the option by default or not.
 #
-
-AC_DEFUN([AC_OPTION], [
+AC_DEFUN([AC_OPTION_Linux_ix86_at], [
 [unset enableval]
 AC_ARG_ENABLE([$1],
-  AS_HELP_STRING([--disable-$1], [disable $2]))
-[enableval=${enableval-$enable_default_device_drivers}]
+  AS_HELP_STRING([--enable-$1], [$2; enabled by default for ix86-at]))
+[#TODO.
+case $host_platform:$host_cpu in
+  at:i?86)
+    enableval=${enableval-$enable_default_device_drivers};;
+  *)
+    if [ x"$enableval" = xyes ]; then
+      # TODO.  That might not always be true.]
+      AC_MSG_ERROR([cannot enable `$1' in this configuration.])
+    [fi;;
+esac]
 AM_CONDITIONAL([device_driver_]m4_bpatsubst([$1], [-], [_]),
-  [test x"$enableval" = xyes])
-[if test x"$enableval" = xyes; then]
+  [[[ x"$enableval" = xyes ]]])
+[if [ x"$enableval" = xyes ]; then
+  have_linux_code=yes]
   AC_DEFINE([$3], [1], [option $1: $2])
   [device_driver_group $4
 fi]])
 
 #
-# AC_OPTION_nodef() is like AC_OPTION(), but doesn't consider
-# $enable_default_device_drivers.
+# AC_OPTION_Linux_ix86_at_nodef() is like AC_OPTION_Linux_ix86_at(), but
+# doesn't consider $enable_default_device_drivers.
 #
-
-AC_DEFUN([AC_OPTION_nodef], [
+AC_DEFUN([AC_OPTION_Linux_ix86_at_nodef], [
 [unset enableval]
 AC_ARG_ENABLE([$1],
-  AS_HELP_STRING([--enable-$1], [enable $2]))
+  AS_HELP_STRING([--enable-$1], [$2]))
+[#TODO.
+case $host_platform:$host_cpu in
+  at:i?86)
+    :;;
+  *)
+    if [ x"$enableval" = xyes ]; then
+      # TODO.  That might not always be true.]
+      AC_MSG_ERROR([cannot enable `$1' in this configuration.])
+    [fi;;
+esac]
 AM_CONDITIONAL([device_driver_]m4_bpatsubst([$1], [-], [_]),
-  [test x"$enableval" = xyes])
-[if test x"$enableval" = xyes; then]
+  [[[ x"$enableval" = xyes ]]])
+[if [ x"$enableval" = xyes ]; then
+  have_linux_code=yes]
   AC_DEFINE([$3], [1], [option $1: $2])
   [device_driver_group $4
 fi]])
@@ -114,10 +111,10 @@ fi]])
 #
 
 AC_DEFUN([AC_Linux_DRIVER], [
-  AC_OPTION([$1], [Linux device driver for $2], [$3], [$4])
+  AC_OPTION_Linux_ix86_at([$1], [Linux device driver for $2], [$3], [$4])
 ])
 AC_DEFUN([AC_Linux_DRIVER_nodef], [
-  AC_OPTION_nodef([$1], [Linux device driver for $2], [$3], [$4])
+  AC_OPTION_Linux_ix86_at_nodef([$1], [Linux device driver for $2], [$3], [$4])
 ])
 
 #
@@ -149,7 +146,7 @@ AC_Linux_DRIVER([BusLogic],
 # TODO.  What's that?  And what about FlashPoint.c?
 dnl Dirty implementation...
 AC_ARG_ENABLE([flashpoint],
-  AS_HELP_STRING([--enable-flashpoint], [enable SCSI flashpoint]),
+  AS_HELP_STRING([--enable-flashpoint], [SCSI flashpoint]),
   [test x"$enableval" = xno &&
    AC_DEFINE([CONFIG_SCSI_OMIT_FLASHPOINT], [], [scsi omit flashpoint])])
 # Disabled by default.
@@ -484,7 +481,7 @@ AC_Linux_DRIVER([i82365],
   [CONFIG_I82365],
   [pcmcia])
 
-AC_OPTION([pcmcia-isa],
+AC_OPTION_Linux_ix86_at([pcmcia-isa],
   [isa bus support in the pcmcia core],
   [CONFIG_ISA],
   [pcmcia])
@@ -559,8 +556,41 @@ if [ x"$device_driver_group_wireless" = xselected ]; then]
 [fi]
 
 #
-# Set up `asm-SYSTYPE' links.
+# Internals.
 #
 
-AC_CONFIG_LINKS([linux/src/include/asm:linux/src/include/asm-$systype
-		 linux/dev/include/asm:linux/dev/include/asm-$systype])
+AC_DEFUN([hurd_host_CPU], [
+  AC_DEFINE([CONFIG_M$1], [1], [$1])
+  AC_DEFINE([CPU], [$1], [CPU])])
+
+[if [ "$have_linux_code" = yes ]; then]
+  AM_CONDITIONAL([CODE_linux], [true])
+
+  [case $host_cpu in
+    i386)]
+      hurd_host_CPU([386])[;;
+    i486)]
+      hurd_host_CPU([486])[;;
+    i586)]
+      hurd_host_CPU([586])[;;
+    i686)]
+      hurd_host_CPU([686])[;;
+    *)
+      # TODO.  Warn here?]
+      hurd_host_CPU([486])[;;
+  esac]
+
+  # The glue code dependend code checks for this.
+  AC_DEFINE([LINUX_DEV], [1], [Linux device drivers.])
+  # Instead of Mach's KERNEL, Linux uses __KERNEL__.  Whee.
+  AC_DEFINE([__KERNEL__], [1], [__KERNEL__])
+
+  # Set up `asm-SYSTYPE' links.
+  AC_CONFIG_LINKS([linux/src/include/asm:linux/src/include/asm-$systype
+		   linux/dev/include/asm:linux/dev/include/asm-$systype])
+[else] AM_CONDITIONAL([CODE_linux], [false])
+[fi]
+
+dnl Local Variables:
+dnl mode: autoconf
+dnl End: