* bin/autom4te.in: Use &fatal where more appropriate than &error.

(freeze): When exiting, use $exit_code.
* lib/autoconf/fortran.m4: Comment changes.

diff --git a/ChangeLog b/ChangeLog
index 3e13df634d4169571ce25a5b54cbec73a76079d3..ea5a47e89574dd84691299bca1e77d977050cfe2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-04  Akim Demaille  <akim@epita.fr>
+
+       * bin/autom4te.in: Use &fatal where more appropriate than &error.
+       (freeze): When exiting, use $exit_code.
+       * lib/autoconf/fortran.m4: Comment changes.
+
 2003-09-04  Akim Demaille  <akim@epita.fr>
 
        * tests/mktests.sh (ac_exclude_list): Add AC_FC_FUNC.

diff --git a/bin/autom4te.in b/bin/autom4te.in
index 1a20d5a25e32db9e7ee6344fac6cc5a09c4c45e6..fc6f7928616374ba8b88c4e0c9ba631d4e7e7fb2 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -89,7 +89,7 @@ my $freeze = 0;
 # $M4.
 my $m4 = $ENV{"M4"} || '@M4@';
 # Some non-GNU m4's don't reject the --help option, so give them /dev/null.
-error "need GNU m4 1.4 or later: $m4"
+fatal "need GNU m4 1.4 or later: $m4"
   if system "$m4 --help </dev/null 2>&1 | grep reload-state >/dev/null";
 
 # Set some high recursion limit as the default limit, 250, has already
@@ -269,7 +269,7 @@ sub load_configuration ($)
       my $type = shift @words;
       if ($type eq 'begin-language:')
        {
-         error "$file:$.: end-language missing for: $lang"
+         fatal "$file:$.: end-language missing for: $lang"
            if defined $lang;
          $lang = lc $words[0];
        }
@@ -281,7 +281,7 @@ sub load_configuration ($)
        }
       elsif ($type eq 'args:')
        {
-         error "$file:$.: no current language"
+         fatal "$file:$.: no current language"
            unless defined $lang;
          push @{$language{$lang}}, @words;
        }
@@ -360,7 +360,7 @@ sub parse_args ()
      "no-cache"  => sub { $cache = undef; },
     );
 
-  error "too few arguments
+  fatal "too few arguments
 Try `$me --help' for more information."
     unless @ARGV;
 
@@ -369,7 +369,7 @@ Try `$me --help' for more information."
   # And it implies melting: there is risk not to update properly using
   # old frozen files, and worse yet: we could load a frozen file and
   # refreeze it!  A sort of caching :)
-  error "cannot freeze and trace"
+  fatal "cannot freeze and trace"
     if $freeze && @trace;
   $melt = 1
     if $freeze;
@@ -472,7 +472,7 @@ sub handle_m4 ($@)
     {
       use File::Copy;
       move ("${file}t", "$file")
-       or error "cannot not rename ${file}t as $file: $!";
+       or fatal "cannot not rename ${file}t as $file: $!";
     }
 }
 
@@ -548,7 +548,7 @@ sub handle_output ($$)
     {
       $out->open($output, O_CREAT | O_WRONLY | O_TRUNC, oct ($mode));
     }
-  error "cannot create $output: $!"
+  fatal "cannot create $output: $!"
     unless $out;
   my $in = new Autom4te::XFile ($ocache . $req->id);
 
@@ -922,7 +922,7 @@ sub freeze ($)
   $result =~ s/#.*\n//g;
   $result =~ s/^\n//mg;
 
-  error "freezing produced output:\n$result"
+  fatal "freezing produced output:\n$result"
     if $result;
 
   # If freezing produces output, something went wrong: a bad `divert',
@@ -951,14 +951,14 @@ parse_args;
 if ($freeze)
   {
     freeze ($output);
-    exit 0;
+    exit $exit_code;
   }
 
 # We need our cache directory.
 if (! -d "$cache")
   {
     mkdir "$cache", 0755
-      or error "cannot create $cache: $!";
+      or fatal "cannot create $cache: $!";
   }
 
 # Open the index for update, and lock it.  autom4te handles several

diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index 50916370a3ddf5f4c67868d27dc100adb7245f00..802dd5b88aade680dc06fb8cbd702396379a9201 100644 (file)
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -1094,7 +1094,7 @@ AC_LANG_POP(Fortran)dnl
 #
 # For ordinary extensions like f90, etcetera, the modified FCFLAGS
 # are currently needed for IBM's xlf* and Intel's ifc (grrr).  Unfortunately,
-* xlf* will only take flags to recognize one extension at a time, so if the
+# xlf* will only take flags to recognize one extension at a time, so if the
 # user wants to compile multiple extensions (.f90 and .f95, say), she
 # will need to use the FCFLAGS_F90 and FCFLAGS_F95 individually rather
 # than just adding them all to FCFLAGS, for example.

diff --git a/man/autom4te.1 b/man/autom4te.1
index 88caa9e881cb9684a4a580bebbbd5560225672fc..c4c9950d56dd7c379de7ddc6d48feac7be756323 100644 (file)
--- a/man/autom4te.1
+++ b/man/autom4te.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH AUTOM4TE "1" "August 2003" "autom4te 2.57c" "User Commands"
+.TH AUTOM4TE "1" "September 2003" "autom4te 2.57c" "User Commands"
 .SH NAME
 autom4te \- Generate files and scripts thanks to M4
 .SH SYNOPSIS