[PATCH 2/7] gnulib-tool: transform hard-coded libgnu.a to $libname.l?a

[Gary V. Vaughan]

This fixes the problem outlined in point 4 of this email:

    http://www.mail-archive.com/address@hidden/msg20010.html

It too could be merged independently of the branch, but from here on in
I've only tested the branch in its entirety.

* gnulib-tool (func_emit_lib_Makefile_am): transform hard-coded
`libgnu.a' in Makefile.am snippets to be either `$libname.a' or
`$libname.la', depending on whether --libtool/--no-libtool options
were given.
---
 ChangeLog   |    8 ++++++++
 gnulib-tool |    6 ++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b0f6a5..c4e2244 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-12  Gary V. Vaughan  <address@hidden>
+
+       gnulib-tool: transform hard-coded libgnu.a to $libname.l?a
+       * gnulib-tool (func_emit_lib_Makefile_am): transform hard-coded
+       `libgnu.a' in Makefile.am snippets to be either `$libname.a' or
+       `$libname.la', depending on whether --libtool/--no-libtool options
+       were given.
+
 2010-10-12  Sam Steingold  <address@hidden>
            Gary V. Vaughan  <address@hidden>
 
diff --git a/gnulib-tool b/gnulib-tool
index f43b7ad..04b4aa2 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2815,6 +2815,11 @@ func_emit_lib_Makefile_am ()
   echo
   uses_subdirs=
   {
+    if test false = "$libtool"; then
+      sed_transform_libgnu_a="s, libgnu\\.a, $libname.a,g"
+    else
+      sed_transform_libgnu_a="s, libgnu\\.a, $libname.la,g"
+    fi
     for module in $modules; do
       func_verify_nontests_module
       if test -n "$module"; then
@@ -2827,6 +2832,7 @@ func_emit_lib_Makefile_am ()
                 -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \
                 -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
                 -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \
+               -e "$sed_transform_libgnu_a" \
                 -e "$sed_transform_check_PROGRAMS"
           if test "$module" = 'alloca'; then
             echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@"
-- 
1.7.3