2005-07-12 Guillem Jover <guillem@hadrons.org>

* configure: Regenerated.
	* i386/configure: Regenerated.

	* Drivers.macros (AC_DRIVER_CLASS): Use AH_TEMPLATE.
	(AC_DRIVER): Set the value for the AC_DEFINE and AC_DEFINE_UNQUOTED
	to 1.

	* aclocal.m4 (AC_PROG_CC_LOCAL, AC_PROG_CC_WORKS_LOCAL): Removed.
	* version.m4: New file.
	* Makefile.in: Use PACKAGE_VERSION, not VERSION.
	* doc/Makefile.in: Likewise.
	* version.c.in: Likewise. Use PACKAGE_NAME, not "GNUmach".
	* i386/linux/Makefile.in (configure): Change its source to
	configure.ac.

	* aclocal.m4: Add missing quotations.
	* Drivers.macros: Likewise.
	* configure.in: Likewise. Include version.m4 and use PACKAGE and
	VERSION m4 macros from it.
	* i386/configure.in: Likewise.
	(AC_INIT): Use new syntax and move source check to AC_CONFIG_SRCDIR.
	* i386/linux/configure.ac: Likewise. Use m4_sinclude, not sinclude.
	* linux/configure.in: Likewise.

	* i386/configure.in: Update AC_DEFINE to the new three argument form.
	* i386/linux/configure.ac: Move AC_DEFINE inside AC_ARG_ENABLE.

	* configure.in: Use AC_CONFIG_LINKS, not AC_LINK_FILES.
	* linux/configure.in: Likewise.

	* i386/configure.in: Call AC_CONFIG_FILES and use the new form of
	AC_OUTPUT.
	* i386/linux/configure.ac: Likewise.
	* linux/configure.in: Likewise

	* configure.in: Use AS_HELP_STRING in AC_ARG_ENABLE help strings.
	* Drivers.macros: Likewise.
	* i386/configure.in: Likewise.
	* i386/linux/configure.ac: Likewise.

2005-07-12  Neal H. Walfield  <neal@cs.uml.edu>

	* configure.in: Update to use autoconf 2.57.
	Do not error out if host_os is not GNU.
	Update AC_DEFINEs to the required three argument form.
	Don't call AC_CHECK_TOOL(CC, gcc) and AC_PROG_CC_LOCAL, just use
	AC_PROG_CC.
	AC_SUBST(LDFLAGS).
	Refactor AC_CONFIG_SUBDIRS to not do variable substitution.
	Call AC_CONFIG_FILES and use the new form of AC_OUTPUT.
	* i386/configure.in: Require autoconf 2.57.
	* linux/configure.in: Likewise.
	* i386/linux/Drivers.in: Move from here...
	* i386/linux/configure.ac: ... to here to conform to the
	environment autoreconf expects.
	(hurd_host_CPU): New macro.
	Call AC_PROG_CC, not AC_PROG_CC_LOCAL.
	AC_SUBST(LD_FLAGS).
	(flashpoint): Update AC_DEFINE to the new three argument form.
	* Drivers.macros (AC_DRIVER): Update AC_DEFINE to the new three
	argument form.

1 files changed, 15 insertions, 12 deletions

diff --git a/Drivers.macros b/Drivers.macros
index ae0a6b3..5fa1db4 100644
--- a/Drivers.macros
+++ b/Drivers.macros
@@ -13,15 +13,16 @@ dnl "AS IS" CONDITION.  THE FREE SOFTWARE FOUNDATION DISCLAIMS ANY
 dnl LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE
 dnl USE OF THIS SOFTWARE.
 
-AC_SUBST(device_drivers)
+AC_SUBST([device_drivers])
 
 dnl AC_DRIVER_ALIAS(alias, canonical) makes --enable-alias have the
 dnl same effect as --enable-canonical.
 
-AC_DEFUN(AC_DRIVER_ALIAS, [
+AC_DEFUN([AC_DRIVER_ALIAS], [
 [#] Checking for alias [$1]
-AC_ARG_ENABLE([$1],,
-enable_[$2]="$enable_[$1]"
+AC_ARG_ENABLE([$1],
+  AS_HELP_STRING([--enable-$1], [enable driver alias $1 for $2]),
+  [enable_$2="$enable_$1"]
 )])
 
 dnl AC_DRIVER_CLASS(name,option,files) defines a class of drivers.  If
@@ -30,9 +31,10 @@ dnl by the user, then set the specified option with AC_DEFINE and add
 dnl the specified files to the output variable `device_drivers'.  This
 dnl macro must precede the use of any corresponding AC_DRIVER macros.
 
-AC_DEFUN(AC_DRIVER_CLASS, [
-driver_class_[$1]_option=[$2]
-driver_class_[$1]_files="[$3]"
+AC_DEFUN([AC_DRIVER_CLASS], [
+AH_TEMPLATE([$2], [Driver Class $1])
+driver_class_$1_option=$2
+driver_class_$1_files="$3"
 ])
 
 dnl AC_DRIVER(name,option,files [,class]) detects option --enable-name.  If
@@ -40,16 +42,17 @@ dnl it's set, then `option' is defined with AC_DEFINE, and files is
 dnl added to the output variable `device_drivers'.  The driver is of class
 dnl `class'; see the comments on AC_DRIVER_CLASS for more information.
 
-AC_DEFUN(AC_DRIVER, [
+AC_DEFUN([AC_DRIVER], [
 [#] Checking for device driver option [$1]
-AC_ARG_ENABLE([$1],,
+AC_ARG_ENABLE([$1],
+AS_HELP_STRING([--enable-$1], [enable driver $1]), [
 if test "x$enableval" != xno; then
-AC_DEFINE([$2])
+AC_DEFINE([$2], [1], [$1])
 device_drivers="$device_drivers [$3]"
 if test "${driver_class_[$4]_selected+set}" != set; then
   driver_class_[$4]_selected=yes
-  AC_DEFINE_UNQUOTED($driver_class_[$4]_option)
+  AC_DEFINE_UNQUOTED([$driver_class_$4_option], [1])
   device_drivers="$device_drivers $driver_class_[$4]_files"
 fi
 fi
-)])
+])])