Re: 1-tvh-autoconf-2.50.diff

[Alexandre Duret-Lutz]

>>> "Tim" == Tim Van Holder <address@hidden> writes:

[...]

 >> Maybe it's time to turn Akim's scan_autoconf_traces() on?
 Tim> I suppose so; or feel free to revert this part of the patch.

Here is another proposition.  Only the lib/am/header-vars.am
part is necessary to fix the testsuite failures.  The rest is
just some cleanup.

2001-09-24  Alexandre Duret-Lutz  <address@hidden>

        * automake.in (obsolete_macros): Update AM_EXEEXT message.
        (seen_object): Remove (unused).
        (scan_one_autoconf_file): Don't handle AC_OBJEXT.
        * lib/am/header-vars.am (EXEEXT, OBJEXT): New variables.
        * tests/obsolete2.test: Use AM_FUNC_FNMATCH instead of AM_EXEEXT.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1173
diff -u -u -b -r1.1173 automake.in
--- automake.in 2001/08/28 03:53:10     1.1173
+++ automake.in 2001/09/24 15:58:17
@@ -294,7 +294,7 @@
      'fp_FUNC_FNMATCH'         => "use `AC_FUNC_FNMATCH'",
      'AM_SANITY_CHECK_CC'      => "automatically done by `AC_PROG_CC'",
      'AM_PROG_INSTALL'         => "use `AC_PROG_INSTALL'",
-     'AM_EXEEXT'               => "use `AC_EXEEXT'",
+     'AM_EXEEXT'               => "automatically done by 
`AC_PROG_(CC|CXX|F77)'",
      'AM_CYGWIN32'             => "use `AC_CYGWIN'",
      'AM_MINGW32'              => "use `AC_MINGW32'",
      'AM_FUNC_MKTIME'          => "use `AC_FUNC_MKTIME'",
@@ -422,9 +422,6 @@
 # TRUE if we've seen AM_PATH_PYTHON.
 my $seen_pythondir = 0;
 
-# TRUE if we've seen AC_OBJEXT.
-my $seen_objext = 0;
-
 # TRUE if we've seen AC_ENABLE_MULTILIB.
 my $seen_multilib = 0;
 
@@ -4700,12 +4697,6 @@
        # Check for ansi2knr.
        $am_c_prototypes = 1 if /AM_C_PROTOTYPES/;
 
-       if (/AC_OBJEXT/)
-       {
-           $seen_objext = 1;
-           $configure_vars{'OBJEXT'} = $filename . ':' . $.;
-       }
-
        # Check for `-c -o' code.
        $seen_cc_c_o = 1 if /AM_PROG_CC_C_O/;
 
Index: lib/am/header-vars.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/header-vars.am,v
retrieving revision 1.39
diff -u -u -b -r1.39 header-vars.am
--- header-vars.am      2001/05/09 18:24:12     1.39
+++ header-vars.am      2001/09/24 15:58:17
@@ -86,3 +86,6 @@
 ?HOST?host_triplet = @host@
 ?TARGET?target_alias = @target_alias@
 ?TARGET?target_triplet = @target@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
Index: tests/obsolete2.test
===================================================================
RCS file: /cvs/automake/automake/tests/obsolete2.test,v
retrieving revision 1.1
diff -u -u -b -r1.1 obsolete2.test
--- obsolete2.test      1999/02/11 15:32:32     1.1
+++ obsolete2.test      2001/09/24 15:58:17
@@ -4,10 +4,10 @@
 
 . $srcdir/defs || exit 1
 
-echo AM_EXEEXT >> configure.in
+echo AM_FUNC_FNMATCH >> configure.in
 
 : > Makefile.am
 
 $AUTOMAKE 2> output && exit 1
 
-grep 'AC_EXEEXT' output
+grep AC_FUNC_FNMATCH output
-- 
Alexandre Duret-Lutz