gnulib-tool: allow --libtool with --create-testdir

[Bruno Haible]

Hi,

Currently, when using "gnulib-tool --create-testdir --libtool", error messages
appear, because ltmain.sh and libtool.m4 are not installed. This fixes it.


2010-03-08  Bruno Haible  <address@hidden>

        gnulib-tool: Add support for --libtool in --create-testdir.
        * gnulib-tool (LIBTOOLPATH, LIBTOOLIZE): New variables.
        (func_create_testdir): Emit LT_INIT invocations. Invoke LIBTOOLIZE.

--- gnulib-tool.orig    Tue Mar  9 00:05:59 2010
+++ gnulib-tool Tue Mar  9 00:02:56 2010
@@ -40,6 +40,9 @@
 # You can set GETTEXTPATH to empty if autopoint 0.15 is already in your PATH.
 GETTEXTPATH=
 
+# You can set LIBTOOLPATH to empty if libtoolize 2.x is already in your PATH.
+LIBTOOLPATH=
+
 # If you didn't set AUTOCONFPATH and AUTOMAKEPATH, you can also set the
 # variables AUTOCONF, AUTOHEADER, ACLOCAL, AUTOMAKE, AUTORECONF individually.
 if test -z "${AUTOCONF}" || test -n "${AUTOCONFPATH}"; then
@@ -63,6 +66,11 @@
   AUTOPOINT="${GETTEXTPATH}autopoint"
 fi
 
+# If you didn't set LIBTOOLPATH, you can also set the variable LIBTOOLIZE.
+if test -z "${LIBTOOLIZE}" || test -n "${LIBTOOLPATH}"; then
+  LIBTOOLIZE="${LIBTOOLPATH}autopoint"
+fi
+
 # You can set MAKE.
 if test -z "${MAKE}"; then
   MAKE=make
@@ -4628,6 +4636,7 @@
      done \
        | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/'
      if test "$libtool" = true; then
+       echo "LT_INIT([win32-dll])"
        echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
        echo "gl_cond_libtool=true"
      else
@@ -4751,6 +4760,7 @@
    done \
      | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/'
    if test "$libtool" = true; then
+     echo "LT_INIT([win32-dll])"
      echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
      echo "gl_cond_libtool=true"
    else
@@ -4829,6 +4839,9 @@
        fi
      done
    fi
+   if test "$libtool" = true; then
+     func_execute_command ${LIBTOOLIZE} --copy || func_exit 1
+   fi
    func_execute_command ${ACLOCAL} -I $m4base || func_exit 1
    if ! test -d build-aux; then
      func_execute_command mkdir build-aux || func_exit 1