changeset 29952:8ddb5699ce12

Work with tar's bootstrap. * gnulib-tool (func_emit_initmacro_end): Use m4_defn in the case where LIBSOURCES_DIR contains .#bootmp but must not be treated as an m4 comment. Signed-off-by: Eric Blake <ebb9@byu.net>
author Eric Blake <ebb9@byu.net>
date Thu, 10 Jul 2008 15:10:42 -0600
parents e5f773018c7b
children d3ee198c4b7a
files ChangeLog gnulib-tool
diffstat 2 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jul 09 11:53:32 2008 +0200
+++ b/ChangeLog	Thu Jul 10 15:10:42 2008 -0600
@@ -1,3 +1,10 @@
+2008-07-10  Eric Blake  <ebb9@byu.net>
+
+	Work with tar's bootstrap.
+	* gnulib-tool (func_emit_initmacro_end): Use m4_defn in the case
+	where LIBSOURCES_DIR contains .#bootmp but must not be treated as
+	an m4 comment.
+
 2008-07-09  Jim Meyering  <meyering@redhat.com>
 
 	posix-shell.m4: fix typo that made this test malfunction
--- a/gnulib-tool	Wed Jul 09 11:53:32 2008 +0200
+++ b/gnulib-tool	Thu Jul 10 15:10:42 2008 -0600
@@ -2068,10 +2068,10 @@
   # the configure.ac resides; if it is run from a different directory, the
   # check is skipped.
   echo "  m4_ifval(${macro_prefix_arg}_LIBSOURCES_LIST, ["
-  echo "    m4_syscmd([test ! -d ]${macro_prefix_arg}_LIBSOURCES_DIR[ ||"
+  echo "    m4_syscmd([test ! -d ]m4_defn([${macro_prefix_arg}_LIBSOURCES_DIR])[ ||"
   echo "      for gl_file in ]${macro_prefix_arg}_LIBSOURCES_LIST[ ; do"
-  echo "        if test ! -r ]${macro_prefix_arg}_LIBSOURCES_DIR[/\$gl_file ; then"
-  echo "          echo \"missing file ]${macro_prefix_arg}_LIBSOURCES_DIR[/\$gl_file\" >&2"
+  echo "        if test ! -r ]m4_defn([${macro_prefix_arg}_LIBSOURCES_DIR])[/\$gl_file ; then"
+  echo "          echo \"missing file ]m4_defn([${macro_prefix_arg}_LIBSOURCES_DIR])[/\$gl_file\" >&2"
   echo "          exit 1"
   echo "        fi"
   echo "      done])dnl"