This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Add in AC_PREREQ to all configure.{in,ac}


This short patch:

1) Makes sure that AC_PREREQ(2.13) is set on all the configure.in's that are still using the old autoconf tools. Note that adding this line has no effect on the generated configure or config.h.in.

2) Makes sure that AC_PREREQ(2.57) is set on all the configure.ac's that have been updated to the new autoconf tools. Again, note that adding this line has no effect on the generated configure or config.h.in.

3) Renames fastjar's and libiberty's configure.in to configure.ac.

4) Regenerates the few files that are actually backlevel to their stated requirements. This turned out to be three files: libiberty's and fastjar's config.h.in and libU77's configure.in

I did regenerate all of the rest of the directories "configure"s. Some of them had a few minor differences that appear to be due to differences in the various recent "unofficial" patches to the stock GNU autoconf 2.13 that different distros may have included. None of the changes looked significant, so I decided to leave the current CVS files as they currently are.

5) Finally it updates install.texi to reflect current reality regarding automake and autoconf versions.

I ended up not actually touching any of the generated automake files since the java directories are the only one using automake 1.4 and they require a java-specific version. Supposedly the java and libstdc++ directories will be moving to a version of automake 1.8.x in the near future and what is currently there is working for their respective maintainers. It seem prudent to wait until after that task is complete and then convert the three remaining automake directories from version 1.7.x that they currently use to whichever 1.8.x version ends up being used. The even more straightforward update from autoconf 2.57 -> 2.59 can wait until then also.

OK to install?
Kelley Cook
boehm-gc/
2004-01-08  Kelley Cook  <kcook@gcc.gnu.org>

	* configure.in: Add in AC_PREREQ(2.13)

fastjar/
2004-01-08  Kelley Cook  <kcook@gcc.gnu.org>

	* configure.in: Rename file to ...
	* configure.ac: ... this.  Add in AC_PREREQ(2.57)
	* config.h.in: Regenerate.

contrib/
2004-01-08  Kelley Cook  <kcook@gcc.gnu.org>

	* gcc_update (files_and_dependencies): Update fastjar/configure.in
	to fastjar/configure.ac

libiberty/
2004-01-08  Kelley Cook  <kcook@gcc.gnu.org>

	* configure.in: Rename file to ...
	* configure.ac: ... this.
	* config.h.in: Regenerate.

libf2c/
2004-01-08  Kelley Cook  <kcook@gcc.gnu.org>

	* libF77/configure.in: Update to AC_PREREQ(2.13)
	* libI77/configure.in: Update to AC_PREREQ(2.13)
	* libU77/configure.in: Update to AC_PREREQ(2.13)
	* libU77/configure: Regenerate. 

libffi/
2004-01-08  Kelley Cook  <kcook@gcc.gnu.org>

	* configure.in: Add in AC_PREREQ(2.13)

libjava/
2004-01-08  Kelley Cook  <kcook@gcc.gnu.org>

	* configure.in: Add in AC_PREREQ(2.13)

libjava/libltdl
2004-01-08  Kelley Cook  <kcook@gcc.gnu.org>

	* configure.in: Update to AC_PREREQ(2.57).  Delete FIXME comment.

zlib/
2004-01-08  Kelley Cook  <kcook@gcc.gnu.org>

	* configure.in: Add in AC_PREREQ(2.13)

gcc/
2004-01-08  Kelley Cook  <kcook@gcc.gnu.org>

	* doc/install.texi:  Update automake and autoconf version requirements.

--- /home/kcook34/gcc-orig/boehm-gc/configure.in	2003-10-03 14:43:06.000000000 -0400
+++ ./boehm-gc/configure.in	2004-01-08 11:09:23.127348800 -0500
@@ -13,6 +13,7 @@
 
 dnl Process this file with autoconf to produce configure.
 
+AC_PREREQ(2.13)
 AC_INIT(gcj_mlc.c)
 
 # This works around the fact that libtool configuration may change LD
--- /home/kcook34/gcc-orig/fastjar/configure.in	2002-12-16 13:18:45.000000000 -0500
+++ ./fastjar/configure.ac	2004-01-07 13:19:16.653664000 -0500
@@ -1,4 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.57)
 AC_INIT(jartool.h)
 AM_INIT_AUTOMAKE(fastjar, 0.92-gcc)
 AM_CONFIG_HEADER(config.h)
--- /home/kcook34/gcc-orig/libf2c/libF77/configure.in	2002-05-31 21:53:50.000000000 -0400
+++ ./libf2c/libF77/configure.in	2004-01-07 12:42:43.560150400 -0500
@@ -19,7 +19,7 @@
 #the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #02111-1307, USA.
 
-AC_PREREQ(2.12.1)
+AC_PREREQ(2.13)
 AC_INIT(getarg_.c)
 
 dnl Checks for programs.
--- /home/kcook34/gcc-orig/libf2c/libI77/configure.in	2003-04-21 09:37:48.000000000 -0400
+++ ./libf2c/libI77/configure.in	2004-01-07 12:42:43.590193600 -0500
@@ -19,7 +19,7 @@
 #the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #02111-1307, USA.
 
-AC_PREREQ(2.12.1)
+AC_PREREQ(2.13)
 AC_INIT(ftell_.c)
 AC_CONFIG_HEADER(config.h)
 
--- /home/kcook34/gcc-orig/libf2c/libU77/configure.in	2003-04-21 09:37:48.000000000 -0400
+++ ./libf2c/libU77/configure.in	2004-01-07 12:42:43.620236800 -0500
@@ -19,7 +19,7 @@
 #to Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307,
 #USA.
 
-AC_PREREQ(2.12.1)
+AC_PREREQ(2.13)
 AC_INIT(access_.c)
 AC_CONFIG_HEADER(config.h:config.hin)
 
--- /home/kcook34/gcc-orig/libffi/configure.in	2003-11-21 06:24:08.000000000 -0500
+++ ./libffi/configure.in	2004-01-08 11:11:33.214404800 -0500
@@ -1,4 +1,5 @@
 dnl Process this with autoconf to create configure
+AC_PREREQ(2.13)
 AC_INIT(fficonfig.h.in)
 AM_CONFIG_HEADER(fficonfig.h)
 
--- /home/kcook34/gcc-orig/libjava/configure.in	2003-12-31 03:58:28.000000000 -0500
+++ ./libjava/configure.in	2004-01-08 11:07:44.585652800 -0500
@@ -1,4 +1,5 @@
 dnl Process this with autoconf to create configure
+AC_PREREQ(2.13)
 AC_INIT(java/lang/System.java)
 
 # This works around the fact that libtool configuration may change LD
--- /home/kcook34/gcc-orig/libjava/libltdl/configure.ac	2003-12-18 16:18:36.000000000 -0500
+++ ./libjava/libltdl/configure.ac	2004-01-08 11:13:20.038009600 -0500
@@ -17,13 +17,10 @@
 # 02111-1307  USA
 
 
-## FIXME: Is this really new enough? ##
-AC_PREREQ(2.50)
-
-
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
+AC_PREREQ(2.57)
 AC_INIT([libltdl], [1.2], [bug-libtool@gnu.org])
 AC_CONFIG_SRCDIR([ltdl.c])
 
--- /home/kcook34/gcc-orig/zlib/configure.in	2003-07-11 22:04:33.000000000 -0400
+++ ./zlib/configure.in	2004-01-07 15:02:21.517060800 -0500
@@ -1,5 +1,6 @@
 dnl Process this with autoconf to create configure
 
+AC_PREREQ(2.13)
 AC_INIT(zlib.h)
 
 # This works around the fact that libtool configuration may change LD
--- /home/kcook34/gcc-orig/contrib/gcc_update	2004-01-07 14:41:08.847051200 -0500
+++ contrib/gcc_update	2004-01-08 11:42:15.573587200 -0500
@@ -86,9 +86,9 @@ libf2c/libU77/configure: libf2c/libU77/c
 libf2c/libU77/stamp-h.in: libf2c/libU77/configure.in libf2c/libU77/acconfig.h
 libobjc/configure: libobjc/configure.in
 # fastjar
-fastjar/aclocal.m4: fastjar/configure.in
-fastjar/Makefile.in: fastjar/Makefile.am fastjar/configure.in fastjar/aclocal.m4
-fastjar/configure: fastjar/configure.in fastjar/aclocal.m4
+fastjar/aclocal.m4: fastjar/configure.ac
+fastjar/Makefile.in: fastjar/Makefile.am fastjar/configure.ac fastjar/aclocal.m4
+fastjar/configure: fastjar/configure.ac fastjar/aclocal.m4
 boehm-gc/aclocal.m4: boehm-gc/configure.in boehm-gc/acinclude.m4
 boehm-gc/Makefile.in: boehm-gc/Makefile.am boehm-gc/configure.in boehm-gc/aclocal.m4
 boehm-gc/configure: boehm-gc/configure.in boehm-gc/aclocal.m4
--- /home/kcook34/gcc-orig/gcc/doc/install.texi	2004-01-06 11:21:17.000000000 -0500
+++ ./gcc/doc/install.texi	2004-01-08 13:22:34.167387200 -0500
@@ -293,15 +293,23 @@ systems' @command{tar} programs will als
 Necessary when modifying @file{configure.in}, @file{aclocal.m4}, etc.@:
 to regenerate @file{configure} and @file{config.in} files.  Most
 directories require autoconf 2.13 (exactly), but @file{libiberty},
-@file{fastjar}, @file{libstdc++-v3}, and @file{gcc} require
+@file{fastjar}, @file{libstdc++-v3}, @file{libltdl}, and @file{gcc} require
 autoconf 2.57 (exactly).
 
-@item automake versions 1.4-p? and 1.7.?
+@item automake versions 1.4-java and 1.7.x
 
-Necessary when modifying a @file{Makefile.am} file to regenerate its
-associated @file{Makefile.in}.  Most directories require a 1.4 series
-automake; @file{libstdc++-v3} and @file{fastjar} requires a 1.7 series
-automake.
+Necessary when modifying a @file{Makefile.am} file to regenerate its associated
+@file{Makefile.in}.
+
+Much of gcc does not use automake, so directly edit the @file{Makefile.in}
+file.  Specifically this applies to the @file{gcc}, @file{intl}, @file{libf2c},
+@file{libiberty}, @file{libobjc} directories as well as any of their
+subdirectories.
+
+The @file{libstdc++-v3}, @file{libltdl}, and @file{fastjar} directories require
+a 1.7 series automake.  However, the Java directories, which include
+@file{boehm-gc}, @file{libffi}, @file{libjava}, and @file{zlib}, require a
+java specialized version of automake-1.4.
 
 @item gettext version 0.12 (or later)
 
@@ -327,7 +335,7 @@ Necessary to regenerate @file{fixinc/fix
 
 Necessary to run the @file{fixinc} @command{make check}.
 
-Necessary to regenerate the top level @file{Makefile.am} files from
+Necessary to regenerate the top level @file{Makefile.in} file from
 @file{Makefile.tpl} and @file{Makefile.def}.
 
 @item GNU Bison version 1.28 (or later)

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]