Better support for lib-link.m4 macros in projects using libtool.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 5898de05409a8c2076e8fe0ed9abbc51dd6fe2d7..e253baf29f80077f67934ba9bb5a4d1a73c6651f 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-24  Bruno Haible  <bruno@clisp.org>
+
+       * lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Don't use AC_LIB_APPENDTOVAR
+       for LIB variables.
+
 2002-01-24  Bruno Haible  <bruno@clisp.org>
 
        * lib-link.m4 (AC_LIB_LINKFLAGS): Also define LTLIB${NAME}.

diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index e4633587e9e6e3c39168748e49d89e5190f44b12..a16aa4460549d17704e10863738a543341bb026a 100644 (file)
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -178,9 +178,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
         if test -n "$value"; then
           if test "$value" = yes; then
             eval value=\"\$LIB$uppername\"
-            AC_LIB_APPENDTOVAR(LIB[]NAME, [$value])
+            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
             eval value=\"\$LTLIB$uppername\"
-            AC_LIB_APPENDTOVAR(LTLIB[]NAME, [$value])
+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
           else
             dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
             dnl that this library doesn't exist. So just drop it.
@@ -501,6 +501,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
 
 dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
 dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
 AC_DEFUN([AC_LIB_APPENDTOVAR],
 [
   for element in [$2]; do

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 4feac0468920dc2d6523c46f056915a3d7e2a8fe..2d06f22e612baaf7de3b3b85976364bc5742a364 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,10 @@
 2002-01-24  Bruno Haible  <bruno@clisp.org>
 
+       * rpathlyx/configure.in: Don't use AC_LIB_APPENDTOVAR for LIB
+       variables.
+       * rpathy/Makefile.am (librpathy_la_LDFLAGS): Use @LTLIBRPATHX@
+       instead of @LIBRPATHX@.
+
        * lang-c: Use $LTLIBINTL instead of $INTLLIBS.
        * lang-c++: Likewise.
        * lang-objc: Likewise.

diff --git a/tests/rpathlyx/configure.in b/tests/rpathlyx/configure.in
index 1a146906f1acc72b902b724c8b86957dca3b5df7..dda807f9935ca58bc86788928a8adca7c9a2856b 100644 (file)
--- a/tests/rpathlyx/configure.in
+++ b/tests/rpathlyx/configure.in
@@ -5,6 +5,6 @@ AM_INIT_AUTOMAKE(gexttext_rpathlyx, 0)
 AC_PROG_CC
 AC_LIB_LINKFLAGS([rpathx])
 AC_LIB_LINKFLAGS([rpathy],[rpathx])
-AC_LIB_APPENDTOVAR([LIBRPATHY], [$LIBRPATHX])
+LIBRPATHY="$LIBRPATHY $LIBRPATHX"
 AC_SUBST(global_top_srcdir)
 AC_OUTPUT([Makefile])

diff --git a/tests/rpathy/Makefile.am b/tests/rpathy/Makefile.am
index 8211094f30dbf54e14bce67ae9397f96132a9d7d..8859f84f658f617d883ac640f305e3ccdf761306 100644 (file)
--- a/tests/rpathy/Makefile.am
+++ b/tests/rpathy/Makefile.am
@@ -2,4 +2,4 @@ AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies
 mkinstalldirs = $(SHELL) @global_top_srcdir@/mkinstalldirs
 lib_LTLIBRARIES = librpathy.la
 librpathy_la_SOURCES = rpathy.c
-librpathy_la_LDFLAGS = @LIBRPATHX@ -lc -no-undefined
+librpathy_la_LDFLAGS = @LTLIBRPATHX@ -lc -no-undefined