Recognize 'foo_LIBRARIES += libgnu.a'.

* gnulib-tool (func_emit_lib_Makefile_am): Recognize if a
makefile snippet has already specified an installation location,
also using '+='.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index b5d4f057196847c09aa075aff64da1ad3ef53656..15ef5245d96c16dbf49796f29cbc183c8770f490 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Recognize 'foo_LIBRARIES += libgnu.a'.
+       * gnulib-tool (func_emit_lib_Makefile_am): Recognize if a
+       makefile snippet has already specified an installation location,
+       also using '+='.
+
 2008-07-02  Ondřej Vašík  <ovasik@redhat.com>
 
        getdate.y: factor out common actions

diff --git a/gnulib-tool b/gnulib-tool
index 9798eaa19f88a85b6e7999cb130cd341bba444bc..1c45002860dc7d140205b5b72747db41462e7b01 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -1737,7 +1737,7 @@ func_emit_lib_Makefile_am ()
     echo "AM_CPPFLAGS ="
   fi
   echo
-  if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *= *$libname\\.$libext\$" allsnippets.tmp > /dev/null; then
+  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.
     :