From b426171e1c5edb2abe10e338da724eb2ad4e5e50 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 2 May 2010 14:49:23 +0200
Subject: [PATCH] Fix regression from 2010-04-25.

---
 ChangeLog   |  7 +++++
 gnulib-tool | 96 ++++++++++++++++++++++++++++---------------------------------
 2 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 19291b0da..69e7f2693 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-05-02  Bruno Haible  <bruno@clisp.org>
 
+	Fix regression from 2010-04-25.
+	* gnulib-tool (func_modules_transitive_closure): Check the status of
+	all modules, not only of the tests that are of the form foo-tests where
+	foo is a module.
+
+2010-05-02  Bruno Haible  <bruno@clisp.org>
+
 	wctob: Work around nasty Cygwin 1.7.2 bug.
 	* m4/wctob.m4 (gl_FUNC_WCTOB): Detect the Cygwin bug.
 	* doc/posix-functions/wctob.texi: Mention the Cygwin bug.
diff --git a/gnulib-tool b/gnulib-tool
index 1902c5c3d..150ac6b08 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2398,63 +2398,55 @@ func_modules_transitive_closure ()
           if test -n "$duplicated_deps"; then
             func_warning "module $module has duplicated dependencies: "`echo $duplicated_deps`
           fi
-          for dep in $deps; do
-            if test -n "$incobsolete" \
-               || { inc=true
-                    for word in `func_get_status $dep`; do
-                      case "$word" in
-                        obsolete)
-                          inc=false
-                          ;;
-                      esac
-                    done
-                    $inc
-                  }; then
-              func_append inmodules " $dep"
-            fi
-          done
           if test -n "$inctests"; then
             testsmodule=`func_get_tests_module $module`
             if test -n "$testsmodule"; then
-              # Determine whether to include the tests module.
-              inc=true
-              for word in `func_get_status "$testsmodule"`; do
-                case "$word" in
-                  c++-test)
-                    test -z "$excl_cxx_tests" \
-                      || inc=false
-                    test -n "$fmtc_inc_all_tests" || test -n "$inc_cxx_tests" \
-                      || inc=false
-                    ;;
-                  longrunning-test)
-                    test -z "$excl_longrunning_tests" \
-                      || inc=false
-                    test -n "$fmtc_inc_all_tests" || test -n "$inc_longrunning_tests" \
-                      || inc=false
-                    ;;
-                  privileged-test)
-                    test -z "$excl_privileged_tests" \
-                      || inc=false
-                    test -n "$fmtc_inc_all_tests" || test -n "$inc_privileged_tests" \
-                      || inc=false
-                    ;;
-                  unportable-test)
-                    test -z "$excl_unportable_tests" \
-                      || inc=false
-                    test -n "$fmtc_inc_all_tests" || test -n "$inc_unportable_tests" \
-                      || inc=false
-                    ;;
-                  *-test)
-                    test -n "$fmtc_inc_all_tests" \
-                      || inc=false
-                    ;;
-                esac
-              done
-              if $inc; then
-                func_append inmodules " $testsmodule"
-              fi
+              deps="$deps $testsmodule"
             fi
           fi
+          for dep in $deps; do
+            # Determine whether to include the dependency or tests module.
+            inc=true
+            for word in `func_get_status $dep`; do
+              case "$word" in
+                obsolete)
+                  test -n "$incobsolete" \
+                    || inc=false
+                  ;;
+                c++-test)
+                  test -z "$excl_cxx_tests" \
+                    || inc=false
+                  test -n "$fmtc_inc_all_tests" || test -n "$inc_cxx_tests" \
+                    || inc=false
+                  ;;
+                longrunning-test)
+                  test -z "$excl_longrunning_tests" \
+                    || inc=false
+                  test -n "$fmtc_inc_all_tests" || test -n "$inc_longrunning_tests" \
+                    || inc=false
+                  ;;
+                privileged-test)
+                  test -z "$excl_privileged_tests" \
+                    || inc=false
+                  test -n "$fmtc_inc_all_tests" || test -n "$inc_privileged_tests" \
+                    || inc=false
+                  ;;
+                unportable-test)
+                  test -z "$excl_unportable_tests" \
+                    || inc=false
+                  test -n "$fmtc_inc_all_tests" || test -n "$inc_unportable_tests" \
+                    || inc=false
+                  ;;
+                *-test)
+                  test -n "$fmtc_inc_all_tests" \
+                    || inc=false
+                  ;;
+              esac
+            done
+            if $inc; then
+              func_append inmodules " $dep"
+            fi
+          done
         fi
       fi
     done
-- 
2.11.0