>From f04b5c3acdc08549fb5b25936d2d17faae83a89b Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Wed, 3 Aug 2022 22:42:25 +0200
Subject: [PATCH 12/12] gnulib-tool.py: Implement option --single-configure.

* gnulib-tool.py (main): Accept option --single-configure. Pass its
value to the GLConfig constructor.
* pygnulib/GLTestDir.py (GLTestDir.execute): Remove debugging output.
---
 ChangeLog             |  5 +++++
 gnulib-tool.py        | 10 +++++++++-
 gnulib-tool.py.TODO   |  1 -
 pygnulib/GLTestDir.py |  1 -
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6723ba9c08..58cb2b610a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2022-08-03  Bruno Haible  <bruno@clisp.org>
 
+	gnulib-tool.py: Implement option --single-configure.
+	* gnulib-tool.py (main): Accept option --single-configure. Pass its
+	value to the GLConfig constructor.
+	* pygnulib/GLTestDir.py (GLTestDir.execute): Remove debugging output.
+
 	gnulib-tool.py: Implement options --without-c++-tests etc.
 	* gnulib-tool.py (main): Accept options --without-c++-tests,
 	--without-longrunning-tests, --without-privileged-tests,
diff --git a/gnulib-tool.py b/gnulib-tool.py
index bf7b98a61e..55e94fb25a 100755
--- a/gnulib-tool.py
+++ b/gnulib-tool.py
@@ -359,6 +359,11 @@ def main():
                         dest="makefile",
                         default=None,
                         type=str)
+    # single-configure
+    parser.add_argument('--single-configure',
+                        dest='single_configure',
+                        default=None,
+                        action='store_true')
     # symlink
     parser.add_argument('-s', '--symbolic', '--symlink',
                         dest='symlink',
@@ -516,7 +521,8 @@ def main():
 
     if ((mode in ['import', 'add-import', 'remove-import']
          and (cmdargs.excl_cxx_tests or cmdargs.excl_longrunning_tests
-              or cmdargs.excl_privileged_tests or cmdargs.excl_unportable_tests))
+              or cmdargs.excl_privileged_tests or cmdargs.excl_unportable_tests
+              or cmdargs.single_configure))
         or (mode == 'update'
             and (cmdargs.localpath != None or cmdargs.libname != None
                  or cmdargs.sourcebase != None or cmdargs.m4base != None
@@ -615,6 +621,7 @@ def main():
                    for module in list1 ]
     symlink = cmdargs.symlink == True
     lsymlink = cmdargs.lsymlink == True
+    single_configure = cmdargs.single_configure
 
     # Create pygnulib configuration.
     config = classes.GLConfig(
@@ -642,6 +649,7 @@ def main():
         symbolic=symlink,
         lsymbolic=lsymlink,
         modcache=modcache,
+        single_configure=single_configure,
         verbose=verbose,
         dryrun=dryrun,
     )
diff --git a/gnulib-tool.py.TODO b/gnulib-tool.py.TODO
index e4dcabef51..8814a215a4 100644
--- a/gnulib-tool.py.TODO
+++ b/gnulib-tool.py.TODO
@@ -24,7 +24,6 @@ Implement the options:
   --extract-recursive-dependencies
   --extract-recursive-link-directive
   --extract-tests-module
-  --single-configure
   --conditional-dependencies
   --no-conditional-dependencies
   --gnu-make
diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py
index cb75ba1eab..384b5f3aeb 100644
--- a/pygnulib/GLTestDir.py
+++ b/pygnulib/GLTestDir.py
@@ -398,7 +398,6 @@ class GLTestDir(object):
             if single_configure:
                 # Create $testsbase/Makefile.am.
                 destfile = joinpath(directory, 'Makefile.am')
-                print(repr(destfile))
                 witness_macro = '%stests_WITNESS' % macro_prefix
                 emit, uses_subdirs = self.emiter.tests_Makefile_am(destfile,
                                                                    tests_modules, self.makefiletable, witness_macro, for_test)
-- 
2.34.1