From 914c5af703e74c78409d795050a5d52149688c4d Mon Sep 17 00:00:00 2001
From: Nathanael Nerode <neroden@gcc.gnu.org>
Date: Sat, 3 Jan 2004 19:04:34 +0000
Subject: [PATCH] configure.ac: Replace AC_INIT, AC_OUTPUT, AC_CANONICAL_SYSTEM
 with modern equivalents.

	* configure.ac: Replace AC_INIT, AC_OUTPUT, AC_CANONICAL_SYSTEM
	with modern equivalents.
	* configure: Regenerate.

From-SVN: r75366
---
 gcc/ChangeLog    |  4 ++++
 gcc/configure    |  6 +++++-
 gcc/configure.ac | 12 +++++++++---
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 148b659313f..555a1e373aa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2004-01-03  Nathanael Nerode  <neroden@gcc.gnu.org>
 
+	* configure.ac: Replace AC_INIT, AC_OUTPUT, AC_CANONICAL_SYSTEM
+	with modern equivalents.
+	* configure: Regenerate.
+
         * configure.ac: Replace gcc_AC_CHECK_TYPE with AC_CHECK_TYPE.
         * aclocal.m4 (gcc_AC_CHECK_TYPE): Remove.
         * configure: Regenerate.
diff --git a/gcc/configure b/gcc/configure
index 40d3b6a2423..e0825eaffc0 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -1326,6 +1326,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
           ac_config_headers="$ac_config_headers auto-host.h:config.in"
 
 
@@ -4983,7 +4984,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then
 else
     ac_prog_version=`$MAKEINFO --version 2>&1 |
                    sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
-  echo "configure:4986: version of makeinfo is $ac_prog_version" >&5
+  echo "configure:4987: version of makeinfo is $ac_prog_version" >&5
   case $ac_prog_version in
     '')     gcc_cv_prog_makeinfo_modern=no;;
     4.[2-9]*)
@@ -12056,7 +12057,10 @@ fi
 # Create the Makefile
 # and configure language subdirectories
           ac_config_files="$ac_config_files $all_outputs"
+
+
           ac_config_commands="$ac_config_commands default"
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
diff --git a/gcc/configure.ac b/gcc/configure.ac
index cbeb3e16b86..e8800a6cc82 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -26,11 +26,14 @@
 # --------------------------------
 
 AC_PREREQ(2.57)
-AC_INIT(tree.c)
+AC_INIT
+AC_CONFIG_SRCDIR(tree.c)
 AC_CONFIG_HEADER(auto-host.h:config.in)
 
 # Determine the host, build, and target systems
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
 
 # Determine the noncanonical target name, for directory use.
 _GCC_TOPLEV_NONCANONICAL_TARGET
@@ -3022,7 +3025,9 @@ fi
 
 # Create the Makefile
 # and configure language subdirectories
-AC_OUTPUT($all_outputs,
+AC_CONFIG_FILES($all_outputs)
+
+AC_CONFIG_COMMANDS([default],
 [
 case ${CONFIG_HEADERS} in
   *auto-host.h:config.in*)
@@ -3055,3 +3060,4 @@ else true ; fi
 [subdirs='$subdirs'
 symbolic_link='$symbolic_link'
 ])
+AC_OUTPUT
-- 
2.30.2