* aclocal.in (obsolete_macros): Update AM_EXEEXT message.

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

* lib/am/texibuild.am: Use $(PATH_SEPARATOR), not ':' to build

diff --git a/ChangeLog b/ChangeLog
index 3d47f63..c6ec9f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,19 @@
+2001-09-25  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * aclocal.in (obsolete_macros): Update AM_EXEEXT message.
+       * automake.in (obsolete_macros): Likewise.
+       (seen_objext): Remove (unused).
+       (scan_one_autoconf_file): Don't handle AC_OBJEXT.
+       * lib/am/header-vars.am (EXEEXT, OBJEXT,
+       PATH_SEPARATOR): New variables.
+       * tests/obsolete2.test: Use AM_FUNC_FNMATCH instead of AM_EXEEXT.
+
 2001-09-23  Tim Van Holder  <tim.van.holder@pandora.be>
 
        * m4/auxdir.m4, m4/init.m4: Require autoconf 2.50 and rely on it to
        neutralize CDPATH for us.
        * m4/init.m4: Don't substitute EXEEXT or OBJEXT anymore.
-       * lib/am/texibuild.am: Use @PATH_SEPARATOR@, not ':' to build
+       * lib/am/texibuild.am: Use $(PATH_SEPARATOR), not ':' to build
        TEXINPUTS.
 
 2001-09-22  Akim Demaille  <akim@epita.fr>

diff --git a/aclocal.in b/aclocal.in
index 97c9eef..b04ebaa 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -94,7 +94,7 @@ my %obsolete_macros =
      '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'",

diff --git a/automake.in b/automake.in
index a47fd07..a9538a9 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -294,7 +294,7 @@ my %obsolete_macros =
      '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 @@ my $seen_lispdir = 0;
 # 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;
 
@@ -2037,7 +2034,7 @@ sub handle_single_transform_list ($$$$@)
 #                              $OBJ, $PARENT, $TOPPARENT)
 # ---------------------------------------------------------------------
 # Define an _OBJECTS variable for a _SOURCES variable (or subvariable)
-# 
+#
 # Arguments are:
 #   $VAR is the name of the _SOURCES variable
 #   $OBJVAR is the name of the _OBJECTS
@@ -2087,7 +2084,7 @@ sub define_objects_from_sources ($$$$$$$)
                my ($from, $to);
                my @temp_list;
                if ($subvar =~ /$SUBST_REF_PATTERN/o)
-               {   
+               {
                    $subvar = $1;
                    $to = $3;
                    ($from = $2) =~ s/(\W)/\\$1/g;
@@ -2116,7 +2113,7 @@ sub define_objects_from_sources ($$$$$$$)
                    $substnum -= 1;
                }
 
-               my (@transformed) = 
+               my (@transformed) =
                      &handle_single_transform_list ($var, $topparent, $one_file, $obj, $val);
                push (@result, @transformed);
                $needlinker = "true" if @transformed;
@@ -4700,12 +4697,6 @@ sub scan_one_autoconf_file
        # 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/;
 
@@ -6068,7 +6059,7 @@ sub variable_conditions_recursive_sub
                {
                    $varname = $1;
                }
- 
+
 
                # Here we compute all the conditions under which the
                # subvariable is defined.  Then we go through and add
@@ -6168,7 +6159,7 @@ sub variable_conditions_reduce
 # Invert a list of conditionals.  Returns a set of conditionals which
 # are never true for any of the input conditionals, and when taken
 # together with the input conditionals cover all possible cases.
-# 
+#
 # For example: invert_conditions("A_TRUE B_TRUE", "A_FALSE B_FALSE") will
 # return ("A_FALSE B_TRUE", "A_TRUE B_FALSE")
 sub invert_conditions

diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 1e09146..187b5ca 100644 (file)
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -86,3 +86,7 @@ POST_UNINSTALL = :
 ?HOST?host_triplet = @host@
 ?TARGET?target_alias = @target_alias@
 ?TARGET?target_triplet = @target@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@

diff --git a/tests/obsolete2.test b/tests/obsolete2.test
index efb9cd2..6ea8ff8 100755 (executable)
--- a/tests/obsolete2.test
+++ b/tests/obsolete2.test
@@ -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