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.

1 files changed, 4 insertions, 16 deletions

diff --git a/configfrag.ac b/configfrag.ac
index c6b08549..361bf38f 100644
--- a/configfrag.ac
+++ b/configfrag.ac
@@ -1,6 +1,6 @@
 dnl Configure fragment for general options.
 
-dnl Copyright 2006, 2007 Free Software Foundation, Inc.
+dnl Copyright (C) 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
@@ -67,12 +67,9 @@ AC_DEFINE([MACH_LDEBUG], [0], [MACH_LDEBUG])
 AC_DEFINE([MACH_LOCK_MON], [0], [MACH_LOCK_MON])
 
 # Does the architecture provide machine-specific interfaces?
-# TODO.  Defining a default value here and potentially overriding it later
-# might or might not work.  See
-# <http://lists.gnu.org/archive/html/autoconf/2006-10/msg00005.html>.  So,
-# comment this out so that the i386-specific one will be used instead.  Doesn't
-# do any harm as we're i386-only so far.
-#AC_DEFINE([MACH_MACHINE_ROUTINES], [0], [MACH_MACHINE_ROUTINES])
+mach_machine_routines=${mach_machine_routines-0}
+AC_DEFINE_UNQUOTED([MACH_MACHINE_ROUTINES], [$mach_machine_routines],
+  [MACH_MACHINE_ROUTINES])
 
 # MP debugging.  Use alternate locking routines to detect deadlocks.  Used in
 # `kern/lock_mon.c'.
@@ -127,15 +124,6 @@ AC_ARG_ENABLE([kmsg],
 [else]
   AM_CONDITIONAL([enable_kmsg], [false])
 [fi]
-
-
-AC_ARG_ENABLE([default-device-drivers],
-  AS_HELP_STRING([--disable-default-device-drivers], [have all of the following
-    device drivers and switches disabled by default; then use the `--enable-*'
-    options to enable only those you actually want to have enabled]))
-[if [ x"$enable_default_device_drivers" != xno ]
-then enable_default_device_drivers=yes
-fi]
 
 #
 # Set up `SYSTYPE/SYSTYPE' and `SYSTYPE/include/mach/SYSTYPE' links.