Avoid link failures with separate libtests.a.

* gnulib-tool (func_emit_tests_Makefile_am): Also list local_ldadd
last, to satisfy circular dependencies.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index d7af7f981bedf51a2f12093227eaa58cc6204f04..ed8799bbfaa4c3bd03eedc500cdaa0b20da09c45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-11  Eric Blake  <ebb9@byu.net>
+
+       Avoid link failures with separate libtests.a.
+       * gnulib-tool (func_emit_tests_Makefile_am): Also list local_ldadd
+       last, to satisfy circular dependencies.
+
 2007-12-11  Eric Blake  <ebb9@byu.net>
        and Bruno Haible  <bruno@clisp.org>
 

diff --git a/gnulib-tool b/gnulib-tool
index 39ac9775d43021f8d2dc741e84af5babe38e94ea..eef55a782f545f6e8cfa831e366a9e7d9ee6d5ec 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -1923,7 +1923,10 @@ func_emit_tests_Makefile_am ()
   if $use_libtests; then
     local_ldadd=' libtests.a $(LIBTESTS_LIBDEPS)'
   fi
-  echo "LDADD =${local_ldadd} ${testsbase_inverse}/${sourcebase-lib}/${libname}.${libext}"
+  # local_ldadd must be listed first, since it often depends on non-test
+  # modules; it must also be listed last, since it can include modules
+  # such as progname that satisfy dependencies of non-test modules.
+  echo "LDADD =${local_ldadd} ${testsbase_inverse}/${sourcebase-lib}/${libname}.${libext}${local_ldadd}"
   echo
   if $use_libtests; then
     echo "libtests_a_SOURCES ="