* m4/minuso.m4 (AM_PROG_CC_C_O): Make sure AC_PROG_CC is never

called after this macro.
* tests/distname.test, tests/subdir5.test, tests/subdir8.test,
tests/subobj.test, tests/subobj4.test, tests/subobj5.test,
tests/subobj6.test: Adjust.
Report from Ralf Wildenhues.

diff --git a/ChangeLog b/ChangeLog
index 23f23e8df9ec1857d8247ec6d58c215cf874cb85..10f2e1df20c3d21dc053a7bbed286bb46ccd66f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2004-09-10  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * m4/minuso.m4 (AM_PROG_CC_C_O): Make sure AC_PROG_CC is never
+       called after this macro.
+       * tests/distname.test, tests/subdir5.test, tests/subdir8.test,
+       tests/subobj.test, tests/subobj4.test, tests/subobj5.test,
+       tests/subobj6.test: Adjust.
+       Report from Ralf Wildenhues.
+
        * lib/Automake/Channels.pm (_print_message): Handle uniq_part with
        arbitrary string.
        * automake.in (lang_c_rewrite): Set uniq_part so that the

diff --git a/m4/minuso.m4 b/m4/minuso.m4
index d111b53ca7a28162a8294da4d6abfe4c87e5a7ce..92049b6416a261728c1360e85cdf77bf3689e266 100644 (file)
--- a/m4/minuso.m4
+++ b/m4/minuso.m4
@@ -37,4 +37,8 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
    # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
    CC="$am_aux_dir/compile $CC"
 fi
+dnl Make sure AC_PROG_CC is never called again, or it will override our
+dnl setting of CC.
+m4_define([AC_PROG_CC],
+          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
 ])

diff --git a/tests/distname.test b/tests/distname.test
index fb051f14af7dbad3716170407865beb4f2262482..b5ae037fe67d0d925b18e497cbb89a586d2a4031 100755 (executable)
--- a/tests/distname.test
+++ b/tests/distname.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -26,8 +26,8 @@
 cat > configure.in << 'END'
 AC_INIT(a.c)
 AM_INIT_AUTOMAKE(nonesuch, 0.23)
-AM_PROG_CC_C_O
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_OUTPUT(Makefile)
 END
 

diff --git a/tests/subdir5.test b/tests/subdir5.test
index 15fb5a0e34a019e899e876ca0fb205f9ce5f2ac3..b19ffb446a397a1ee30443d01ae943c366a1be86 100755 (executable)
--- a/tests/subdir5.test
+++ b/tests/subdir5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -34,7 +34,6 @@ cat > configure.in << 'END'
 AC_INIT(maude, 1.0)
 AM_INIT_AUTOMAKE
 AM_PROG_CC_C_O
-AC_PROG_CC
 AC_CONFIG_FILES(Makefile)
 AC_OUTPUT
 END
@@ -63,8 +62,8 @@ $MAKE
 cat > configure.in << 'END'
 AC_INIT(maude, 1.0)
 AM_INIT_AUTOMAKE
-AM_PROG_CC_C_O
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_CONFIG_FILES(Makefile maude/Makefile)
 m4_include([confile.m4])
 AC_OUTPUT

diff --git a/tests/subdir8.test b/tests/subdir8.test
index ed8610d0447315554f0f4348df23929d7d6eed0e..66367a51e13c06c01052132d0a048e4d69f0c62a 100755 (executable)
--- a/tests/subdir8.test
+++ b/tests/subdir8.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -33,8 +33,8 @@ set -e
 echo 'AC_CONFIG_FILES([sub/Makefile])' >confiles.m4
 
 cat >> configure.in << 'END'
-AM_PROG_CC_C_O
 AC_PROG_CC
+AM_PROG_CC_C_O
 m4_include([confiles.m4])
 MORE_DEFS
 AC_OUTPUT

diff --git a/tests/subobj.test b/tests/subobj.test
index e170522d4c0939f9af902d350e5351a7dd973215..a3c378027e69ca0bf215e313c2f49caca9feb66c 100755 (executable)
--- a/tests/subobj.test
+++ b/tests/subobj.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -25,8 +25,8 @@
 set -e
 
 cat >> configure.in << 'END'
-AM_PROG_CC_C_O
 AC_PROG_CC
+AM_PROG_CC_C_O
 END
 
 cat > Makefile.am << 'END'

diff --git a/tests/subobj4.test b/tests/subobj4.test
index 440e128efa460d7116452466eb52083c2fbed8e1..f78a36c5c45efcf54d2e8541ea80306ff1f8fad0 100755 (executable)
--- a/tests/subobj4.test
+++ b/tests/subobj4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -24,8 +24,8 @@
 . ./defs || exit 1
 
 cat >> configure.in << 'END'
-AM_PROG_CC_C_O
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_OUTPUT(d1/Makefile d2/Makefile)
 END

diff --git a/tests/subobj5.test b/tests/subobj5.test
index 90ff0f57b4a6af1fb80004722884ec45da0055f2..231a440328abc1b50d185ef1354df24b94f805bd 100755 (executable)
--- a/tests/subobj5.test
+++ b/tests/subobj5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -26,8 +26,8 @@
 cat > configure.in << 'END'
 AC_INIT(generic/a.c)
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AM_PROG_CC_C_O
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_OUTPUT(Makefile generic/Makefile)
 END
 

diff --git a/tests/subobj6.test b/tests/subobj6.test
index 7ed32526f005275c30de4c60a1488fd74400ce0e..22ea8c1690e58fa113210b9d6cc6a45510cb3025 100755 (executable)
--- a/tests/subobj6.test
+++ b/tests/subobj6.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -26,7 +26,6 @@ required=gcc
 
 cat >> configure.in << 'END'
 AM_PROG_CC_C_O
-AC_PROG_CC
 AC_OUTPUT
 END