From 2046ebdc38bd1e6f4b69b901a46839bf1e82ab75 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 3 Oct 2009 18:13:38 +0200
Subject: [PATCH] Conditionally emit AM_PROG_CC_C_O invocation to
 tests/configure.ac.

---
 ChangeLog   | 6 ++++++
 gnulib-tool | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 8bcb8b19f..e747ef6f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-03  Bruno Haible  <bruno@clisp.org>
+
+	* gnulib-tool (func_create_testdir): Conditionally emit AM_PROG_CC_C_O
+	invocation to tests/configure.ac.
+	Reported by Ian Beckwith <ianb@erislabs.net>.
+
 2009-10-02  Eric Blake  <ebb9@byu.net>
 
 	fchdir: avoid compiler warning
diff --git a/gnulib-tool b/gnulib-tool
index ea018bd71..397f442b3 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -4019,6 +4019,10 @@ func_create_testdir ()
      echo "AC_PROG_MAKE_SET"
      echo "AC_PROG_RANLIB"
      echo
+     if test -n "$uses_subdirs"; then
+       echo "AM_PROG_CC_C_O"
+       echo
+     fi
      for module in $modules; do
        func_verify_module
        if test -n "$module"; then
-- 
2.11.0