* gnulib-tool: Define automake conditional GL_COND_LIBTOOL if

libtool is used (to be used by modules Makefile.am snippet),
suggested by Bruno Haible <bruno@clisp.org>.
* modules/gc (Makefile.am): Use it.

diff --git a/ChangeLog b/ChangeLog
index 6f21457d12a042cd122e54ee70fd7bac56cc9759..bcce75edd67c17aeba1410ce319a31f41afcd97e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-21  Simon Josefsson  <jas@extundo.com>
+
+       * gnulib-tool: Define automake conditional GL_COND_LIBTOOL if
+       libtool is used (to be used by modules Makefile.am snippet),
+       suggested by Bruno Haible <bruno@clisp.org>.
+
+       * modules/gc (Makefile.am): Use it.
+
 2005-10-21  Simon Josefsson  <jas@extundo.com>
 
        * modules/des, modules/des-tests: New files.

diff --git a/gnulib-tool b/gnulib-tool
index 971843f7d6cd18d09f40ce69ed84c97ac33e3879..563db84fa3f678be2bbd37c0e9b7aca2c253d06a 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2005-10-17 15:44:51 $'
+cvsdatestamp='$Date: 2005-10-21 13:14:35 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -1226,6 +1226,11 @@ func_import ()
     echo "# \"Check for header files, types and library functions\"."
     echo "AC_DEFUN([${macro_prefix}_INIT],"
     echo "["
+    if test -z "$libtool"; then
+      echo "AM_CONDITIONAL(GL_COND_LIBTOOL, false)"
+    else
+      echo "AM_CONDITIONAL(GL_COND_LIBTOOL, true)"
+    fi
     for module in $modules; do
       func_verify_module
       if test -n "$module"; then
@@ -1426,6 +1431,11 @@ func_create_testdir ()
        echo "gl_USE_SYSTEM_EXTENSIONS"
        echo
      fi
+     if test -z "$libtool"; then
+       echo "AM_CONDITIONAL(GL_COND_LIBTOOL, false)"
+     else
+       echo "AM_CONDITIONAL(GL_COND_LIBTOOL, true)"
+     fi
      # We don't have explicit ordering constraints between the various
      # autoconf snippets. It's cleanest to put those of the library before
      # those of the tests.
@@ -1485,6 +1495,11 @@ func_create_testdir ()
      echo "gl_USE_SYSTEM_EXTENSIONS"
      echo
    fi
+   if test -z "$libtool"; then
+     echo "AM_CONDITIONAL(GL_COND_LIBTOOL, false)"
+   else
+     echo "AM_CONDITIONAL(GL_COND_LIBTOOL, true)"
+   fi
    for module in $modules; do
      func_verify_nontests_module
      if test -n "$module"; then

diff --git a/modules/gc b/modules/gc
index cb771c367d743f76255eaba49b2e84dc629cb8b0..be59785e704d8f849bae91b335538fb43f7faf8e 100644 (file)
--- a/modules/gc
+++ b/modules/gc
@@ -15,7 +15,11 @@ configure.ac:
 gl_GC
 
 Makefile.am:
+if GL_COND_LIBTOOL
+lib_LIBADD += $(LTLIBGCRYPT)
+else
 lib_LIBADD += $(LIBGCRYPT)
+endif
 
 Include:
 "gc.h"