RANLIB is needed.

diff --git a/ChangeLog b/ChangeLog
index 7b42570fb702840cbe88dab7acd7e4c7e73634ec..b463a6460de9c67cc6b2f4bd79b3a20d4d4d647c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-07  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_import): Add an AC_PROG_RANLIB dependency to
+       gl_EARLY.
+
 2006-01-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        * README: Gnulib normally doesn't generate a tarball.

diff --git a/gnulib-tool b/gnulib-tool
index 5f20206147807b02a1d5373c291adee4cd94a02e..9aaa1b15ff4fde53ceb4adc9268e01f1b42a65dd 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002-2006 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2005-12-02 13:37:34 $'
+cvsdatestamp='$Date: 2006-01-09 13:27:12 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -1242,6 +1242,7 @@ func_import ()
     echo "# any checks for libraries, header files, types and library functions."
     echo "AC_DEFUN([${macro_prefix}_EARLY],"
     echo "["
+    echo "  AC_REQUIRE([AC_PROG_RANLIB])"
     if grep AC_GNU_SOURCE "$destdir"/$m4base/*.m4 > /dev/null; then
       echo "  AC_REQUIRE([AC_GNU_SOURCE])"
     fi
@@ -1255,9 +1256,9 @@ func_import ()
     echo "AC_DEFUN([${macro_prefix}_INIT],"
     echo "["
     if test -z "$libtool"; then
-      echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
+      echo "  AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
     else
-      echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
+      echo "  AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
     fi
     for module in $modules; do
       func_verify_module