[project @ 2004-09-18 12:49:55 by panne]

Make autoupdate 2.52 happy, mainly by using the new formats of AC_INIT and
AC_OUTPUT. This has the nice side effect that all "packages" have now a name, a
version, a bug-report address, and a tar name, yielding better output with
"configure --help=recursive". Nuked an unused AC_STRUCT_ST_BLKSIZE test on the
way.

diff --git a/aclocal.m4 b/aclocal.m4
index d5a6cd8..8633ad4 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -655,7 +655,7 @@ dnl
 AC_DEFUN(FPTOOLS_GHC_VERSION,
 [FPTOOLS_NOCACHE_CHECK([version of ghc], [fptools_version_of_ghc],
 ["${WithGhc-ghc}" --version > conftestghc 2>&1
-  cat conftestghc >&AC_FD_CC
+  cat conftestghc >&AS_MESSAGE_LOG_FD
 #Useless Use Of cat award...
   fptools_version_of_ghc=`cat conftestghc | sed -n -e 's/, patchlevel *\([[0-9]]\)/.\1/;s/.* version \([[0-9]][[0-9.]]*\).*/\1/p'`
   rm -fr conftest*
@@ -1098,7 +1098,7 @@ AC_DEFUN([FP_CHECK_GL_HELPER],
 # -----------
 AC_DEFUN([FP_CHECK_GL],
 [AC_REQUIRE([FP_PATH_X])
-AC_REQUIRE([AC_CANONICAL_SYSTEM])
+AC_REQUIRE([AC_CANONICAL_TARGET])
 
 AC_ARG_ENABLE([hopengl],
   [AC_HELP_STRING([--enable-hopengl],

diff --git a/configure.ac b/configure.ac
index bdccd70..a8a484b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,8 +13,10 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
+AC_INIT([fptools build system], [1.0], [cvs-fptools@haskell.org], [fptools])
+
 # First off, a distrib sanity check..
-AC_INIT(mk/config.mk.in)
+AC_CONFIG_SRCDIR([mk/config.mk.in])
 
 dnl * We require autoconf version 2.52
 dnl We need 2.50 due to the use of AC_SYS_LARGEFILE and AC_MSG_NOTICE.
@@ -45,7 +47,7 @@ dnl * Choose host(/target/build) platform
 dnl--------------------------------------------------------------------
 
 dnl Guess host/target/build platform(s) if necessary.
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
 
 # "$host" defaults to "$target"
 if test "x$host" = xNONE ; then
@@ -995,9 +997,6 @@ AC_STRUCT_TIMEZONE
 dnl ** do we have altzone?
 FP_DECL_ALTZONE
 
-dnl ** does struct stat contain st_blksize?
-AC_STRUCT_ST_BLKSIZE
-
 dnl ** do we have long longs?
 AC_CHECK_TYPES([long long])
 
@@ -1380,7 +1379,7 @@ dnl ** can we get alloca?
 AC_FUNC_ALLOCA
 
 dnl ** Working vfork?
-AC_FUNC_VFORK
+AC_FUNC_FORK
 
 dnl ** determine whether or not const works
 AC_C_CONST
@@ -1410,4 +1409,6 @@ FPTOOLS_LD_X
 
 FP_EMPTY_STRUCTS
 
-AC_OUTPUT(mk/config.mk, echo timestamp > mk/stamp-h )
+AC_CONFIG_FILES([mk/config.mk])
+AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
+AC_OUTPUT

diff --git a/ghc/configure.ac b/ghc/configure.ac
index efbf7d0..040041d 100644 (file)
--- a/ghc/configure.ac
+++ b/ghc/configure.ac
@@ -1,9 +1,11 @@
 # Initialise and check sanity.
-AC_INIT([ghc.spec.in])
+AC_INIT([Glasgow Haskell Compiler], [6.3], [glasgow-haskell-bugs@haskell.org], [ghc])
+AC_CONFIG_SRCDIR([ghc.spec.in])
 
 # Compute the version number and the release, they are needed by the .spec file.
 AC_SUBST([version], [[`sed 's/.* version \([0-9][0-9.]*\).*/\1/' VERSION`]])
 AC_SUBST([release], [1])
 
 # Write the results...
-AC_OUTPUT([ghc.spec])
+AC_CONFIG_FILES([ghc.spec])
+AC_OUTPUT