gnulib-tool: Provide the value of --m4-base to modules.

diff --git a/ChangeLog b/ChangeLog
index f463e41069cd83565c00135fd0f5ea6ccba13801..4fa27f24a4888c8f19e5f2ec1e39baea5c787254 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-02  Bruno Haible  <bruno@clisp.org>
+
+       gnulib-tool: Provide the value of --m4-base to modules.
+       * gnulib-tool (func_import, func_create_testdir): Emit a definition
+       of gl_m4_base.
+
 2010-04-02  Eric Blake  <eblake@redhat.com>
 
        maint.mk: fix some fallout

diff --git a/gnulib-tool b/gnulib-tool
index 0b07e7a1a9e2d70d916ab3bb13e16ec877a52224..84ea7a07c2f306bf8f6d091dc7b9b75df28c2edf 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -4328,6 +4328,7 @@ s,//*$,/,'
     else
       sed_replace_build_aux="$sed_noop"
     fi
+    echo "  gl_m4_base='$m4base'"
     func_emit_initmacro_start $macro_prefix
     echo "  gl_source_base='$sourcebase'"
     for module in $main_modules; do
@@ -4903,6 +4904,7 @@ func_create_testdir ()
          s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)|
          ba
        }'
+     echo "gl_m4_base='../$m4base'"
      func_emit_initmacro_start $macro_prefix
      # We don't have explicit ordering constraints between the various
      # autoconf snippets. It's cleanest to put those of the library before
@@ -5032,6 +5034,7 @@ func_create_testdir ()
    else
      sed_replace_build_aux="$sed_noop"
    fi
+   echo "gl_m4_base='$m4base'"
    func_emit_initmacro_start $macro_prefix
    echo "gl_source_base='$sourcebase'"
    for module in $modules; do