Make it easier to distribute gnulib-built libraries.

diff --git a/ChangeLog b/ChangeLog
index 1f5ef9e85184d28a5cb1acc95d0ac626bb8f8a05..d5cee0f3601cbc353a0972c85dfbf877debbca4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-05  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_emit_lib_Makefile_am): Don't add the library to
+       noinst_LTLIBRARIES if the Makefile.am in the same directory specifies
+       that it should be installed.
+
 2009-04-05  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool: New option --copy-file.

diff --git a/gnulib-tool b/gnulib-tool
index 0b059e124b3db10926552e8e3126f7c68c9aeb94..56f5616ceb8dc294e32a4e73f884ebd6fe11ae35 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2047,9 +2047,14 @@ func_emit_lib_Makefile_am ()
     echo "AM_CFLAGS ="
   fi
   echo
-  if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" allsnippets.tmp > /dev/null; then
-    # One of the snippets already specifies an installation location for the
-    # library. Don't confuse automake by saying it should not be installed.
+  if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" allsnippets.tmp > /dev/null \
+     || { test -n "$makefile_name" \
+          && test -f "$sourcebase/Makefile.am" \
+          && LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" "$sourcebase/Makefile.am" > /dev/null; \
+        }; then
+    # One of the snippets or the user's Makefile.am already specifies an
+    # installation location for the library. Don't confuse automake by saying
+    # it should not be installed.
     :
   else
     # By default, the generated library should not be installed.