* lib/Autom4te/General.pm (&update_file): s/die/error/.

Reported by Raja R. Harinath.
* bin/autoheader.in, bin/autoreconf.in, bin/autoscan.in,
* bin/autoupdate.in: Use error instead of die.

diff --git a/ChangeLog b/ChangeLog
index 5e6208fff55c435da1e56bd47fd3cc0b0c0fb76f..1da91f0f11aaf90c432e2fad5d174f282a7e3602 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-02  Akim Demaille  <akim@epita.fr>
+
+       * lib/Autom4te/General.pm (&update_file): s/die/error/.
+       Reported by Raja R. Harinath.
+       * bin/autoheader.in, bin/autoreconf.in, bin/autoscan.in,
+       * bin/autoupdate.in: Use error instead of die.
+
 2002-09-01  Paul Eggert  <eggert@twinsun.com>
 
        * tests/mktests.sh (ac_exclude_egrep, au_exclude_egrep): Use

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 0071d66f952d9a26c492f5f5f5d817ba2cf06745..8f8bca127f4e43832c93a708e4bbba7645d0bcee 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -111,7 +111,7 @@ sub parse_args ()
   if (! @ARGV)
     {
       my $configure_ac = find_configure_ac;
-      die "$me: no input file\n"
+      error "no input file"
        unless $configure_ac;
       push @ARGV, $configure_ac;
     }
@@ -176,7 +176,7 @@ xsystem ("$autoconf "
 local (%verbatim, %symbol);
 do "$tmp/traces.pl";
 warn "couldn't parse $tmp/traces.pl: $@" if $@;
-die "$me: error: AC_CONFIG_HEADERS not found in $ARGV[0]\n"
+error "error: AC_CONFIG_HEADERS not found in $ARGV[0]"
   unless $config_h;
 
 # We template only the first CONFIG_HEADER.

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index cefb9dfba9c4bd4d64493b3f0614bff6b80b3e5d..d86de2856b2780b3309add3f58e76386bdfa614f 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -193,10 +193,10 @@ sub autoreconf ($)
 
   verbose "working in `$directory'";
   chdir $directory
-    or die "$me: cannot chdir to $directory: $!\n";
+    or error "cannot chdir to $directory: $!";
 
   my $configure_ac = find_configure_ac;
-  die "$me: cannot find `configure.ac' in `$directory'\n"
+  error "cannot find `configure.ac' in `$directory'"
     unless $configure_ac;
 
   # ---------------------- #
@@ -480,7 +480,7 @@ sub autoreconf ($)
     }
 
   chdir $cwd
-    or die "$me: cannot chdir to $cwd: $!\n";
+    or error "cannot chdir to $cwd: $!";
 }
 
 

diff --git a/bin/autoscan.in b/bin/autoscan.in
index e4455612cddd327a6f274eddeb20fda61a8ce892..0293acb620099d386db535c82df3102a9df5ad08 100644 (file)
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
@@ -133,7 +133,7 @@ Try `$me --help' for more information.\n"
   my $srcdir = $ARGV[0] || ".";
 
   verbose "srcdir = $srcdir";
-  chdir $srcdir || die "$me: cannot cd to $srcdir: $!\n";
+  chdir $srcdir || error "cannot cd to $srcdir: $!";
 }
 
 
@@ -164,7 +164,7 @@ sub init_tables ()
            if /^\s*$/ || /^\s*\#/;
          unless (/^(\S+)\s+(\S.*)$/ || /^(\S+)\s*$/)
            {
-             die "$me: cannot parse definition in $file:\n$_\n";
+             error "cannot parse definition in $file:\n$_";
            }
          my $word = $1;
          my $macro = $2 || $generic_macro{$kind};
@@ -185,7 +185,7 @@ sub init_tables ()
       $table->close;
     }
 
-  die "$me: some tables are inconsistent\n"
+  error "some tables are inconsistent"
     if !$tables_are_consistent;
 }
 

diff --git a/bin/autoupdate.in b/bin/autoupdate.in
index 417f0b504cb4a1acb24b95ab83979408493a5d8e..5327de23dcd795509bb901d7f2ef29ad631254f6 100644 (file)
--- a/bin/autoupdate.in
+++ b/bin/autoupdate.in
@@ -95,7 +95,7 @@ sub parse_args ()
   if (! @ARGV)
     {
       my $configure_ac = find_configure_ac;
-      die "$me: no input file\n"
+      error "no input file"
        unless $configure_ac;
       push @ARGV, $configure_ac;
     }
@@ -173,7 +173,7 @@ sub handle_autoconf_macros ()
       # aclocal.m4 -> aclocal
       my $set = basename (dirname ($file));
       $set = 'aclocal' if $file eq 'aclocal.m4';
-      die "$me: unknown set: $set: $_\n"
+      error "unknown set: $set: $_"
        unless $set =~ /^(m4sugar|aclocal|autoconf)$/;
       if ($domain eq "AC")
        {
@@ -193,9 +193,9 @@ sub handle_autoconf_macros ()
   # such as `builtin', `changequote' etc.  See autoconf/autoconf.m4.
   delete $ac_macros{$_}
     foreach (@m4_builtins);
-  die "$me: no current Autoconf macros found\n"
+  error "no current Autoconf macros found"
     unless keys %ac_macros;
-  die "$me: no obsolete Autoconf macros found\n"
+  error "no obsolete Autoconf macros found"
     unless keys %au_macros;
 
   if ($debug)
@@ -371,9 +371,9 @@ EOF
 
     # prepared input -- input, but reenables the quote before each AU macro.
     open INPUT_M4, ">$tmp/input.m4"
-       or die "$me: cannot open: $!\n";
+       or error "cannot open: $!";
     open FILE, "<$file"
-       or die "$me: cannot open: $!\n";
+       or error "cannot open: $!";
     print INPUT_M4 "$input_m4";
     while (<FILE>)
        {
@@ -381,9 +381,9 @@ EOF
         print INPUT_M4;
        }
     close FILE
-       or die "$me: cannot close $file: $!\n";
+       or error "cannot close $file: $!";
     close INPUT_M4
-       or die "$me: cannot close $tmp/input.m4: $!\n";
+       or error "cannot close $tmp/input.m4: $!";
 
     # Now ask m4 to perform the update.
     xsystem ("$m4 --include=$tmp"

diff --git a/lib/Autom4te/General.pm b/lib/Autom4te/General.pm
index b9ee7249c4a91fb024ea8ae52fa3ebf13d391d88..1cc57c08eee513c1457bac72b3850511df867f4c 100644 (file)
--- a/lib/Autom4te/General.pm
+++ b/lib/Autom4te/General.pm
@@ -424,7 +424,7 @@ sub update_file ($$)
        }
       $in->close;
       unlink ($from)
-       or die "cannot not remove $from: $!";
+       or error "cannot not remove $from: $!";
       return;
     }