From: Bruno Haible <bruno@clisp.org>
Date: Fri, 2 Apr 2010 14:51:12 +0000 (+0200)
Subject: gnulib-tool: Provide the value of --m4-base to modules.
X-Git-Tag: v0.1~4382
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=91d3c57d448966c86d89f61003e5a48b32e103de;p=gnulib.git

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

diff --git a/ChangeLog b/ChangeLog
index f463e4106..4fa27f24a 100644
--- 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 0b07e7a1a..84ea7a07c 100755
--- 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