* autoupdate.in: Support DOS paths. Initialize $tmp to

avoid warnings.  Default $autoconf to 'autoconf'.

diff --git a/ChangeLog b/ChangeLog
index 5771a209cf1fdfeb876e1be11046e50ca20282e2..8b3304a9b41424762bc5330a99aa10c51cbea141 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-25  Tim Van Holder <tim.van.holder@pandora.be>
+
+       * autoupdate.in: Support DOS paths.  Initialize $tmp to
+       avoid warnings.  Default $autoconf to 'autoconf'.
+
 2001-02-25  Akim Demaille  <akim@epita.fr>
 
        * autoupdate.in (&END): Try to preserve the exit status.
@@ -34,7 +39,7 @@
 
        * autoupdate.in (&parse_args): Support `-'.
 
-       
+
 2001-02-25  Akim Demaille  <akim@epita.fr>
 
        * autoupdate.in: Less Bournisms, more Wallisms.

diff --git a/autoupdate.in b/autoupdate.in
index eef3419a8e9391e45512e6efd98188b745ba3bb5..7c5ffaac10fffbc6b6d839bb721aee855fb50772 100644 (file)
--- a/autoupdate.in
+++ b/autoupdate.in
@@ -24,7 +24,7 @@ require 5.005;
 use Getopt::Long;
 use strict;
 
-(my $me = $0) =~ s,.*/,,;
+(my $me = $0) =~ s,.*[\\/],,;
 
 # Lib files.
 my $autoconf_dir = $ENV{"AC_MACRODIR"} || "@datadir@";
@@ -35,7 +35,7 @@ my $localdir = '.';
 my $m4 = $ENV{"M4"} || "@M4@";
 my $verbose = 0;
 my $SIMPLE_BACKUP_SUFFIX = $ENV{'SIMPLE_BACKUP_SUFFIX'} || '~';
-my $tmp;
+my $tmp = '';
 
 
 ## ---------- ##
@@ -205,7 +205,7 @@ sub find_slaves ()
     if system "$m4 --help </dev/null 2>&1 | fgrep reload-state >/dev/null";
 
   # autoconf.
-  (my $dir = $0) =~ s,[^/]*$,,;
+  (my $dir = $0) =~ s,[^\\/]*$,,;
 
   # We test "$dir/autoconf" in case we are in the build tree, in which case
   # the names are not transformed yet.
@@ -220,6 +220,11 @@ sub find_slaves ()
          last;
        }
     }
+
+  # This is needed because perl's '-x' isn't a smart as bash's; that
+  # is, it won't find autoconf.sh.
+  $autoconf = 'autoconf'
+    if !$autoconf;
 }
 
 

diff --git a/autoupdate.sh b/autoupdate.sh
index eef3419a8e9391e45512e6efd98188b745ba3bb5..7c5ffaac10fffbc6b6d839bb721aee855fb50772 100644 (file)
--- a/autoupdate.sh
+++ b/autoupdate.sh
@@ -24,7 +24,7 @@ require 5.005;
 use Getopt::Long;
 use strict;
 
-(my $me = $0) =~ s,.*/,,;
+(my $me = $0) =~ s,.*[\\/],,;
 
 # Lib files.
 my $autoconf_dir = $ENV{"AC_MACRODIR"} || "@datadir@";
@@ -35,7 +35,7 @@ my $localdir = '.';
 my $m4 = $ENV{"M4"} || "@M4@";
 my $verbose = 0;
 my $SIMPLE_BACKUP_SUFFIX = $ENV{'SIMPLE_BACKUP_SUFFIX'} || '~';
-my $tmp;
+my $tmp = '';
 
 
 ## ---------- ##
@@ -205,7 +205,7 @@ sub find_slaves ()
     if system "$m4 --help </dev/null 2>&1 | fgrep reload-state >/dev/null";
 
   # autoconf.
-  (my $dir = $0) =~ s,[^/]*$,,;
+  (my $dir = $0) =~ s,[^\\/]*$,,;
 
   # We test "$dir/autoconf" in case we are in the build tree, in which case
   # the names are not transformed yet.
@@ -220,6 +220,11 @@ sub find_slaves ()
          last;
        }
     }
+
+  # This is needed because perl's '-x' isn't a smart as bash's; that
+  # is, it won't find autoconf.sh.
+  $autoconf = 'autoconf'
+    if !$autoconf;
 }
 
 

diff --git a/bin/autoupdate.in b/bin/autoupdate.in
index eef3419a8e9391e45512e6efd98188b745ba3bb5..7c5ffaac10fffbc6b6d839bb721aee855fb50772 100644 (file)
--- a/bin/autoupdate.in
+++ b/bin/autoupdate.in
@@ -24,7 +24,7 @@ require 5.005;
 use Getopt::Long;
 use strict;
 
-(my $me = $0) =~ s,.*/,,;
+(my $me = $0) =~ s,.*[\\/],,;
 
 # Lib files.
 my $autoconf_dir = $ENV{"AC_MACRODIR"} || "@datadir@";
@@ -35,7 +35,7 @@ my $localdir = '.';
 my $m4 = $ENV{"M4"} || "@M4@";
 my $verbose = 0;
 my $SIMPLE_BACKUP_SUFFIX = $ENV{'SIMPLE_BACKUP_SUFFIX'} || '~';
-my $tmp;
+my $tmp = '';
 
 
 ## ---------- ##
@@ -205,7 +205,7 @@ sub find_slaves ()
     if system "$m4 --help </dev/null 2>&1 | fgrep reload-state >/dev/null";
 
   # autoconf.
-  (my $dir = $0) =~ s,[^/]*$,,;
+  (my $dir = $0) =~ s,[^\\/]*$,,;
 
   # We test "$dir/autoconf" in case we are in the build tree, in which case
   # the names are not transformed yet.
@@ -220,6 +220,11 @@ sub find_slaves ()
          last;
        }
     }
+
+  # This is needed because perl's '-x' isn't a smart as bash's; that
+  # is, it won't find autoconf.sh.
+  $autoconf = 'autoconf'
+    if !$autoconf;
 }