From 5e296ad2e2d1edc350dc8eb7f136655173aaa8c5 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Tue, 9 Mar 2010 00:09:41 +0100
Subject: [PATCH] gnulib-tool: Add support for --libtool in --create-testdir.

---
 ChangeLog   |  6 ++++++
 gnulib-tool | 13 +++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 115d59d04..6bb76f4dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-08  Bruno Haible  <bruno@clisp.org>
+
+	gnulib-tool: Add support for --libtool in --create-testdir.
+	* gnulib-tool (LIBTOOLPATH, LIBTOOLIZE): New variables.
+	(func_create_testdir): Emit LT_INIT invocations. Invoke LIBTOOLIZE.
+
 2010-03-08  Eric Blake  <eblake@redhat.com>
 
 	gnulib-tool.texi: mention possibility of git submodule
diff --git a/gnulib-tool b/gnulib-tool
index a5e2e422b..29a7de28e 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -40,6 +40,9 @@ AUTOMAKEPATH=
 # 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 @@ if test -z "${AUTOPOINT}" || test -n "${GETTEXTPATH}"; then
   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 @@ func_create_testdir ()
      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 @@ func_create_testdir ()
    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 @@ func_create_testdir ()
        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
-- 
2.11.0