* ltconfig.in (RANLIB): Accept, in order of decreasing preference:

the cached value; an environment setting; the first file called
``ranlib'' in the user's path.

diff --git a/ChangeLog b/ChangeLog
index 5125a7898d54634267040c09e260ee91f983eaa3..d0a3c4654f76b21b9731170c55133f8629cfeffe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-06-08  Gary V. Vaughan  <gary@oranda.demon.co.uk>
 
+       * ltconfig.in (RANLIB): Accept, in order of decreasing preference:
+       the cached value; an environment setting; the first file called
+       ``ranlib'' in the user's path.
+
        * ltmain.in (exeext): Use $exeext when working out the names of
        programs (but not the wrapper script itself due to a stupidity in
        win32 which hardwires the .exe extension to the binary loader!).

diff --git a/ltconfig.in b/ltconfig.in
index c29a8af248b392e7b78977978966c7c308a5ef3c..314e72b0395adb12b157541248ab3c601adc493b 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -480,29 +480,35 @@ test -z "$AR" && AR=ar
 # Set a sane default for `OBJDUMP'.
 test -z "$OBJDUMP" && OBJDUMP=objdump
 
-# If RANLIB is not set, then run the test.
-if test "${RANLIB+set}" != "set"; then
-  result=no
-
-  echo $ac_n "checking for ranlib... $ac_c" 1>&6
-  IFS="${IFS=  }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-  for dir in $PATH; do
-    test -z "$dir" && dir=.
-    if test -f $dir/ranlib || test -f $dir/ranlib$ac_exeext; then
-      RANLIB="ranlib"
-      result="ranlib"
-      break
-    fi
-  done
-  IFS="$save_ifs"
-
-  echo "$ac_t$result" 1>&6
+echo $ac_n "checking for ranlib... $ac_c" 1>&6
+echo "$progname:@LINENO@: checking for ranlib" 1>&5
+if test "${ac_cv_prog_RANLIB+set}" = "set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+  result="$ac_cv_prog_RANLIB"
+else
+  if test -n "$RANLIB"; then
+    result="$RANLIB"           # Let the user override the test.
+    ac_cv_prog_RANLIB="$result"
+  else
+    result=no
+    IFS="${IFS=        }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+    for dir in $PATH; do
+      test -z "$dir" && dir=.
+      if test -f $dir/ranlib || test -f $dir/ranlib$ac_exeext; then
+        result="ranlib"
+        ac_cv_prog_RANLIB="$result"
+        break
+      fi
+    done
+    IFS="$save_ifs"
+  fi
 fi
-
-if test -n "$RANLIB"; then
+if test -n "$ac_cv_prog_RANLIB"; then
+  RANLIB="$ac_cv_prog_RANLIB"
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
   old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
 fi
+echo "$ac_t$result" 1>&6
 
 # Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
 test -z "$DLLTOOL" && DLLTOOL=dlltool