From: Tom Tromey <tromey@redhat.com>
Date: Mon, 22 Mar 1999 11:49:49 +0000 (+0000)
Subject: 1999-02-01  Thomas Tanner  <tanner@gmx.de>
X-Git-Tag: user-dep-gen-branchpoint~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afa8bf3c6d33754796653e2c87707689e948eb61;p=thirdparty%2Fautomake.git

1999-02-01  Thomas Tanner  <tanner@gmx.de>
	* automake.in: accept both A(C|M)_PROG_LIBTOOL, print a
	warning when AM_PROG_LIBTOOL was found
	* automake.texi: renamed AM_PROG_LIBTOOL to AC_PROG_LIBTOOL
---

diff --git a/ChangeLog b/ChangeLog
index 9f1137269..85f58b9ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-02-01  Thomas Tanner  <tanner@gmx.de>
+
+	* automake.in: accept both A(C|M)_PROG_LIBTOOL, print a
+	warning when AM_PROG_LIBTOOL was found
+	* automake.texi: renamed AM_PROG_LIBTOOL to AC_PROG_LIBTOOL
+
 1999-03-22  Tom Tromey  <tromey@cygnus.com>
 
 	Made `+=' more robust.  Fixes pluseq6.test and pluseq7.test.
diff --git a/TODO b/TODO
index 95a4a60e2..fbb19a2f8 100644
--- a/TODO
+++ b/TODO
@@ -4,6 +4,7 @@
 
 * CFLAGS only defined if C source seen
   but really it should be a configure variable, shouldn't it?
+  There are other examples of this
 
 * Get rid of .s.o and .S.o rules unless assembly source is seen.
 
diff --git a/automake.in b/automake.in
index 0e45ef978..fec411f9b 100755
--- a/automake.in
+++ b/automake.in
@@ -182,7 +182,7 @@ $seen_canonical = 0;
 # TRUE if we've seen AC_ARG_PROGRAM.
 $seen_arg_prog = 0;
 
-# TRUE if we've seen AM_PROG_LIBTOOL.
+# TRUE if we've seen AC_PROG_LIBTOOL.
 $seen_libtool = 0;
 $libtool_line = 0;
 
@@ -4280,14 +4280,18 @@ sub scan_one_configure_file
 	$seen_prog_install = 1 if /AC_PROG_INSTALL/;
         $seen_lispdir = 1 if /AM_PATH_LISPDIR/;
 
-        if (/AM_PROG_LIBTOOL/)
+        if (/A(C|M)_PROG_LIBTOOL/)
 	{
+	    if (/AM_PROG_LIBTOOL/)
+	    {
+	    	&am_conf_line_warning ($filename, $., "\`AM_PROG_LIBTOOL' is obsolete, use \`AC_PROG_LIBTOOL' instead");
+	    }
 	    $seen_libtool = 1;
 	    $libtool_line = $.;
 	    $configure_vars{'LIBTOOL'} = $filename . ':' . $.;
 	    $configure_vars{'RANLIB'} = $filename . ':' . $.;
 	    $configure_vars{'CC'} = $filename . ':' . $.;
-	    # AM_PROG_LIBTOOL runs AC_CANONICAL_HOST.  Make sure we
+	    # AC_PROG_LIBTOOL runs AC_CANONICAL_HOST.  Make sure we
 	    # never downgrade (if we've seen AC_CANONICAL_SYSTEM).
 	    $seen_canonical = $AC_CANONICAL_HOST if ! $seen_canonical;
 	}
diff --git a/automake.texi b/automake.texi
index e3dad9c6f..d7d319740 100644
--- a/automake.texi
+++ b/automake.texi
@@ -1111,10 +1111,10 @@ languages that include Fortran 77 (@pxref{Mixing Fortran 77 With C and
 C++}).  @xref{Macros, , Autoconf macros supplied with Automake}.
 @cvindex AC_F77_LIBRARY_LDFLAGS
 
-@item AM_PROG_LIBTOOL
+@item AC_PROG_LIBTOOL
 Automake will turn on processing for @code{libtool} (@pxref{Top, ,
 Introduction, libtool, The Libtool Manual}).
-@cvindex AM_PROG_LIBTOOL
+@cvindex AC_PROG_LIBTOOL
 
 @item AC_PROG_YACC
 If a Yacc source file is seen, then you must either use this macro or
diff --git a/stamp-vti b/stamp-vti
index 01294f163..1623932f1 100644
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 22 January 1999
+@set UPDATED 22 March 1999
 @set EDITION 1.4a
 @set VERSION 1.4a
diff --git a/version.texi b/version.texi
index 01294f163..1623932f1 100644
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 22 January 1999
+@set UPDATED 22 March 1999
 @set EDITION 1.4a
 @set VERSION 1.4a