compile: rewrite AC_PROG_CC with AM_PROG_CC_C_O contents

[platform/upstream/automake.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 840abf4..74b7c1c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,9 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.69])
-AC_INIT([GNU Automake], [1.13.2a], [bug-automake@gnu.org])
+AC_INIT([GNU Automake], [1.13a], [bug-automake@gnu.org])
 
-AC_CONFIG_SRCDIR([automake.in])
+AC_CONFIG_SRCDIR([bin/automake.in])
 AC_CONFIG_AUX_DIR([lib])
 
 AM_SILENT_RULES([yes])
@@ -387,6 +387,11 @@ AC_ARG_VAR([AM_TEST_RUNNER_SHELL],
 
 # Look for C, C++ and fortran compilers to be used in the testsuite.
 
+dnl We don't care whether the C Compiler supports "-c -o" together
+dnl or not.  OTOH, we don't want $CC to be rewritten, so we must
+dnl redefine AM_PROG_CC_C_O to be a no-op.
+m4_define([AM_PROG_CC_C_O], [])
+
 dnl We don't want to abort our configuration script if no C compiler is
 dnl available, as such a compiler is only required to run part of the
 dnl testsuite, not to build or install Automake.  Ditto for C++, Fortran