[PATCH 01/15] gnulib-tool: let macros access gnulib-tool parameters

[Paolo Bonzini]

* gnulib-tool: Wrap contents of gnulib-tool.m4 within a gl_CONFIG macro.
Require it.
* m4/gnulib-tool.m4: Define gl_GNULIB_* macros according to contents of
gnulib-cache.m4.
---
 gnulib-tool       |    3 +++
 m4/gnulib-tool.m4 |   33 +++++++++++++++++----------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/gnulib-tool b/gnulib-tool
index 407a96f..f9584a4 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -4202,6 +4202,7 @@ s,//*$,/,'
     echo "#   $actioncmd"
     echo
     echo "# Specification in the form of a few gnulib-tool.m4 macro 
invocations:"
+    echo "AC_DEFUN([gl_CONFIG], ["
     # Store the local_gnulib_dir relative to destdir.
     case "$local_gnulib_dir" in
       "" | /*)
@@ -4249,6 +4250,7 @@ s,//*$,/,'
     if test -n "$vc_files"; then
       echo "gl_VC_FILES([$vc_files])"
     fi
+    echo "])"
   ) > "$tmpfile"
   if test -f "$destdir"/$m4base/gnulib-cache.m4; then
     if cmp "$destdir"/$m4base/gnulib-cache.m4 "$tmpfile" > /dev/null; then
@@ -4304,6 +4306,7 @@ s,//*$,/,'
     if test -n "$uses_subdirs"; then
       echo "  AC_REQUIRE([AM_PROG_CC_C_O])"
     fi
+    echo "  AC_REQUIRE([gl_CONFIG])"
     for module in $final_modules; do
       func_verify_module
       if test -n "$module"; then
diff --git a/m4/gnulib-tool.m4 b/m4/gnulib-tool.m4
index 69e7733..61bb6d5 100644
--- a/m4/gnulib-tool.m4
+++ b/m4/gnulib-tool.m4
@@ -9,49 +9,50 @@ dnl Invoking them does nothing except to declare default 
arguments
 dnl for "gnulib-tool --import".
 
 dnl Usage: gl_LOCAL_DIR([DIR])
-AC_DEFUN([gl_LOCAL_DIR], [])
+AC_DEFUN([gl_LOCAL_DIR], [m4_define([gl_GNULIB_LOCAL_DIR], [$1])])
 
 dnl Usage: gl_MODULES([module1 module2 ...])
-AC_DEFUN([gl_MODULES], [])
+AC_DEFUN([gl_MODULES], [m4_define([gl_GNULIB_MODULES], [$1])])
 
 dnl Usage: gl_AVOID([module1 module2 ...])
-AC_DEFUN([gl_AVOID], [])
+AC_DEFUN([gl_AVOID], [m4_define([gl_GNULIB_AVOID], [$1])])
 
 dnl Usage: gl_SOURCE_BASE([DIR])
-AC_DEFUN([gl_SOURCE_BASE], [])
+AC_DEFUN([gl_SOURCE_BASE], [m4_define([gl_GNULIB_SOURCE_BASE], [$1])])
 
 dnl Usage: gl_M4_BASE([DIR])
-AC_DEFUN([gl_M4_BASE], [])
+AC_DEFUN([gl_M4_BASE], [m4_define([gl_GNULIB_M4_BASE], [$1])])
 
 dnl Usage: gl_PO_BASE([DIR])
-AC_DEFUN([gl_PO_BASE], [])
+AC_DEFUN([gl_PO_BASE], [m4_define([gl_GNULIB_PO_BASE], [$1])])
 
 dnl Usage: gl_DOC_BASE([DIR])
-AC_DEFUN([gl_DOC_BASE], [])
+AC_DEFUN([gl_DOC_BASE], [m4_define([gl_GNULIB_DOC_BASE], [$1])])
 
 dnl Usage: gl_TESTS_BASE([DIR])
-AC_DEFUN([gl_TESTS_BASE], [])
+AC_DEFUN([gl_TESTS_BASE], [m4_define([gl_GNULIB_TESTS_BASE], [$1])])
 
 dnl Usage: gl_WITH_TESTS
-AC_DEFUN([gl_WITH_TESTS], [])
+AC_DEFUN([gl_WITH_TESTS], [m4_define([gl_GNULIB_WITH_TESTS])])
 
 dnl Usage: gl_LIB([LIBNAME])
-AC_DEFUN([gl_LIB], [])
+AC_DEFUN([gl_LIB], [m4_define([gl_GNULIB_LIB], [$1])])
 
 dnl Usage: gl_LGPL or gl_LGPL([VERSION])
-AC_DEFUN([gl_LGPL], [])
+AC_DEFUN([gl_LGPL], [m4_define([gl_GNULIB_LGPL], [$1])])
 
 dnl Usage: gl_MAKEFILE_NAME([FILENAME])
-AC_DEFUN([gl_MAKEFILE_NAME], [])
+AC_DEFUN([gl_MAKEFILE_NAME], [m4_define([gl_GNULIB_MAKEFILE_NAME], [$1])])
 
 dnl Usage: gl_LIBTOOL
-AC_DEFUN([gl_LIBTOOL], [])
+AC_DEFUN([gl_LIBTOOL], [m4_define([gl_GNULIB_LIBTOOL])])
 
 dnl Usage: gl_MACRO_PREFIX([PREFIX])
-AC_DEFUN([gl_MACRO_PREFIX], [])
+AC_DEFUN([gl_MACRO_PREFIX], [m4_define([gl_GNULIB_MACRO_PREFIX], [$1])])
 
 dnl Usage: gl_PO_DOMAIN([DOMAIN])
-AC_DEFUN([gl_PO_DOMAIN], [])
+AC_DEFUN([gl_PO_DOMAIN], [m4_define([gl_GNULIB_PO_DOMAIN], [$1])])
 
 dnl Usage: gl_VC_FILES([BOOLEAN])
-AC_DEFUN([gl_VC_FILES], [])
+AC_DEFUN([gl_VC_FILES], [m4_define([gl_GNULIB_VC_FILES], [$1])])
+
-- 
1.6.6.1