2006-10-12 Thomas Schwinge <tschwinge@gnu.org>

* version.m4: Rewrite.
	* configure.in: Adopt to the above.
	* i386/configure.in: Likewise.
	* i386/linux/configure.ac: Likewise.
	* linux/configure.in: Likewise.

6 files changed, 28 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index e4cbd901..f8649f20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-12  Thomas Schwinge  <tschwinge@gnu.org>
+
+	* version.m4: Rewrite.
+	* configure.in: Adopt to the above.
+	* i386/configure.in: Likewise.
+	* i386/linux/configure.ac: Likewise.
+	* linux/configure.in: Likewise.
+
 2006-10-09  Thomas Schwinge  <tschwinge@gnu.org>
 
 	* ddb/tr.h: Insert the content of `bogus/mach_assert.h' instead of
diff --git a/configure.in b/configure.in
index 539c54d1..e51e497b 100644
--- a/configure.in
+++ b/configure.in
@@ -11,13 +11,13 @@ dnl THE FREE SOFTWARE FOUNDATION ALLOWS FREE USE OF THIS SOFTWARE IN ITS
 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_PREREQ([2.57])
 
 m4_include([version.m4])
-
-AC_INIT([PACKAGE], [VERSION], [bug-hurd@gnu.org], [gnumach])
+AC_INIT([AC_PACKAGE_NAME], [AC_PACKAGE_VERSION], [AC_PACKAGE_BUGREPORT], [AC_PACKAGE_TARNAME])
 AC_CONFIG_SRCDIR([kern/ipc_kobject.c])
-AC_PREREQ(2.57)
-
+
 #
 # Deduce output var `systype' from configuration parms.
 #
diff --git a/i386/configure.in b/i386/configure.in
index 93d74764..98fe2b13 100644
--- a/i386/configure.in
+++ b/i386/configure.in
@@ -11,14 +11,13 @@ dnl THE FREE SOFTWARE FOUNDATION ALLOWS FREE USE OF THIS SOFTWARE IN ITS
 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_PREREQ([2.57])
 
 m4_include([../version.m4])
-
-AC_INIT([PACKAGE], [VERSION], [bug-hurd@gnu.org], [gnumach])
+AC_INIT([AC_PACKAGE_NAME], [AC_PACKAGE_VERSION], [AC_PACKAGE_BUGREPORT], [AC_PACKAGE_TARNAME])
 AC_CONFIG_SRCDIR([i386/i386asm.sym])
-AC_PREREQ(2.57)
-
+
 #
 # Options
 #
diff --git a/i386/linux/configure.ac b/i386/linux/configure.ac
index be44ea84..53a213f4 100644
--- a/i386/linux/configure.ac
+++ b/i386/linux/configure.ac
@@ -11,13 +11,13 @@ dnl THE FREE SOFTWARE FOUNDATION ALLOWS FREE USE OF THIS SOFTWARE IN ITS
 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_PREREQ([2.57])
 
 m4_include([../../version.m4])
-
-AC_INIT([PACKAGE], [VERSION], [bug-hurd@gnu.org], [gnumach])
+AC_INIT([AC_PACKAGE_NAME], [AC_PACKAGE_VERSION], [AC_PACKAGE_BUGREPORT], [AC_PACKAGE_TARNAME])
 AC_CONFIG_SRCDIR([dev/include/linux/autoconf.h])
-AC_PREREQ(2.57)
-
+
 m4_sinclude([../../Drivers.macros])
 m4_sinclude([../../aclocal.m4])
 
diff --git a/linux/configure.in b/linux/configure.in
index dd1c7225..b8da2e53 100644
--- a/linux/configure.in
+++ b/linux/configure.in
@@ -11,13 +11,13 @@ dnl THE FREE SOFTWARE FOUNDATION ALLOWS FREE USE OF THIS SOFTWARE IN ITS
 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_PREREQ([2.57])
 
 m4_include([../version.m4])
-
-AC_INIT([PACKAGE], [VERSION], [bug-hurd@gnu.org], [gnumach])
+AC_INIT([AC_PACKAGE_NAME], [AC_PACKAGE_VERSION], [AC_PACKAGE_BUGREPORT], [AC_PACKAGE_TARNAME])
 AC_CONFIG_SRCDIR([src/include/linux/version.h])
-AC_PREREQ(2.57)
-
+
 m4_sinclude([../aclocal.m4])
 
 hurd_SYSTYPE
diff --git a/version.m4 b/version.m4
index c4f8d01e..9a6e3c04 100644
--- a/version.m4
+++ b/version.m4
@@ -1,3 +1,4 @@
-m4_define([PACKAGE],[GNU Mach])
-m4_define([VERSION],[1.3])
-
+m4_define([AC_PACKAGE_NAME],[GNU Mach])
+m4_define([AC_PACKAGE_VERSION],[1.3])
+m4_define([AC_PACKAGE_BUGREPORT],[bug-hurd@gnu.org])
+m4_define([AC_PACKAGE_TARNAME],[gnumach])