Proper autoconf macro argument quoting.

diff --git a/ChangeLog b/ChangeLog
index bcce75edd67c17aeba1410ce319a31f41afcd97e..312289caa05e4152f242f42b27c75a1263f7ef0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+2005-10-21  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_import, func_create_testdir): Add quoting to last
+       patch.
+
 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),
+       * gnulib-tool (func_import, func_create_testdir): 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/gnulib-tool b/gnulib-tool
index 563db84fa3f678be2bbd37c0e9b7aca2c253d06a..1103fdf238bade2bcd9c2cef5d0d29d3f9f39b47 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2005-10-21 13:14:35 $'
+cvsdatestamp='$Date: 2005-10-21 15:05:31 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -1227,9 +1227,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
@@ -1432,9 +1432,9 @@ func_create_testdir ()
        echo
      fi
      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
      # We don't have explicit ordering constraints between the various
      # autoconf snippets. It's cleanest to put those of the library before
@@ -1496,9 +1496,9 @@ func_create_testdir ()
      echo
    fi
    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_nontests_module