* bootstrap (no_cache): New var, to accommodate different wget

variants.  Use it instead of '-C off'.  Problem reported by
twlevo@xs4all.nl.

diff --git a/ChangeLog b/ChangeLog
index b0ad42f94d4268f9674869a8ce05e15e8d7f74f1..b1cc1fb045be58e90959aab1d84d892d60aa97ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-08-25  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * bootstrap (no_cache): New var, to accommodate different wget
+       variants.  Use it instead of '-C off'.  Problem reported by
+       twlevo@xs4all.nl.
+
        * data/glr.c (yydestroyStackItem): New function.
        (yyrecoverSyntaxError, yyreturn): Use it to improve quality of
        debugging information.  Problem reported by Joel E. Denny.

diff --git a/bootstrap b/bootstrap
index 2d78e3544886a7ed2107c6df34787ba642d8a596..4b6b012f78ace45f172000c743cc744a80fa7bb5 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -25,6 +25,7 @@ package=bison
 
 # Ensure file names are sorted consistently across platforms;
 # e.g., m4/ulonglong_gl.m4 should follow m4/ulonglong.m4.
+# Also, ensure diagnostics are in English, e.g., "wget --help" below.
 LC_ALL=C
 export LC_ALL
 
@@ -164,10 +165,19 @@ sed '
 
 case $SKIP_PO in
 '')
+  case `wget --help` in
+  *'--no-cache'*)
+    no_cache='--no-cache';;
+  *'--cache=on/off'*)
+    no_cache='--cache=off';;
+  *)
+    no_cache='';;
+  esac
+
   echo "$0: getting translations into po (please ignore the robots.txt ERROR 404)..."
   (cd po &&
    rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'` &&
-   wget -nv -nd -r -l 1 -A .po -C off \
+   wget -nv -nd -r -l 1 -A .po $no_cache \
      http://www.iro.umontreal.ca/translation/maint/$package/ &&
    ls *.po | sed 's/\.po$//' >LINGUAS
   ) || exit
@@ -177,7 +187,7 @@ case $SKIP_PO in
     echo "$0: getting translations into po (please ignore the robots.txt ERROR 404)..."
     (cd runtime-po &&
      rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po$/p'` &&
-     wget -nv -nd -r -l 1 -A .po -C off \
+     wget -nv -nd -r -l 1 -A .po $no_cache \
        http://www.iro.umontreal.ca/translation/maint/$package-runtime/ &&
 
      # For translations that have not yet been upgraded to the new