From cd58dba367a3b8ffbebb23f2099a820106197fae Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 29 Oct 2017 16:57:32 +0100
Subject: [PATCH] gnulib-tool: Avoid unnecessary config.h.in remaking in
 testdirs.

* gnulib-tool (func_create_testdir): Use workaround against 'autoheader'
bug reported at <https://savannah.gnu.org/support/index.php?109406>.
---
 ChangeLog   | 6 ++++++
 gnulib-tool | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a07ef22c3b..8286e4fc56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-29  Bruno Haible  <bruno@clisp.org>
+
+	gnulib-tool: Avoid unnecessary config.h remaking in testdirs.
+	* gnulib-tool (func_create_testdir): Use workaround against 'autoheader'
+	bug reported at <https://savannah.gnu.org/support/index.php?109406>.
+
 2017-10-29  Bruno Haible  <bruno@clisp.org>
 
 	crypto/*: Verify that the header file is self-contained.
diff --git a/gnulib-tool b/gnulib-tool
index 3c4bce0287..36493a9eea 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -6477,7 +6477,8 @@ func_create_testdir ()
      func_execute_command mkdir build-aux || func_exit 1
    fi
    func_execute_command ${AUTOCONF} || func_exit 1
-   func_execute_command ${AUTOHEADER} || func_exit 1
+   # Explicit 'touch config.h.in': see <https://savannah.gnu.org/support/index.php?109406>.
+   func_execute_command "${AUTOHEADER} && touch config.h.in" || func_exit 1
    func_execute_command ${AUTOMAKE} --add-missing --copy || func_exit 1
    rm -rf autom4te.cache
   ) || func_exit 1
@@ -6499,7 +6500,8 @@ func_create_testdir ()
        func_execute_command mkdir ../build-aux
      fi
      func_execute_command ${AUTOCONF} || func_exit 1
-     func_execute_command ${AUTOHEADER} || func_exit 1
+     # Explicit 'touch config.h.in': see <https://savannah.gnu.org/support/index.php?109406>.
+     func_execute_command "${AUTOHEADER} && touch config.h.in" || func_exit 1
      func_execute_command ${AUTOMAKE} --add-missing --copy || func_exit 1
      rm -rf autom4te.cache
     ) || func_exit 1
-- 
2.39.5