Eric Blake <ebb9 <at> byu.net> writes:

> > I replied to that issue on bug-libtool (--preserve-dup-deps before
> > --mode on the libtool link command line, i.e., in *_LIBTOOLFLAGS).
> 
> Bruno - is this flag worth adding when using a separate test library?

Like so.  I'm committing this, since it fixes `make check' for m4 head, and 
only affects the gnulib test directory.


From: Eric Blake <[EMAIL PROTECTED]>
Date: Wed, 12 Dec 2007 10:29:17 -0700
Subject: [PATCH] Allow circular dependency of separate libtests.a

* gnulib-tool (func_emit_tests_Makefile_am): Add AM_LIBTOOLFLAGS
when use_libtests.

Signed-off-by: Eric Blake <[EMAIL PROTECTED]>
---
 ChangeLog   |    6 ++++++
 gnulib-tool |    2 ++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a954c4c..1b1f43b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-12  Eric Blake  <[EMAIL PROTECTED]>
+
+       Allow circular dependency of separate libtests.a
+       * gnulib-tool (func_emit_tests_Makefile_am): Add AM_LIBTOOLFLAGS
+       when use_libtests.
+
 2007-12-11  Eric Blake  <[EMAIL PROTECTED]>
 
        Fix bug with -0.0L in previous patch.
diff --git a/gnulib-tool b/gnulib-tool
index eef55a7..1cdb902 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -1935,6 +1935,8 @@ func_emit_tests_Makefile_am ()
     echo "libtests_a_LIBADD = \$(${macro_prefix}tests_LIBOBJS)"
     echo "libtests_a_DEPENDENCIES = \$(${macro_prefix}tests_LIBOBJS)"
     echo "EXTRA_libtests_a_SOURCES ="
+    # The circular dependency in LDADD requires this.
+    echo "AM_LIBTOOLFLAGS = --preserve-dup-deps"
     echo
   fi
   cat allsnippets.tmp \
-- 
1.5.3.5




Reply via email to