FYI: AC_PROG_CC never after AM_PROG_CC_C_O

[Alexandre Duret-Lutz]

>>> "Ralf" == Ralf Wildenhues <address@hidden> writes:

[...]
 Ralf> I mistakenly added the AM_PROG_CC_C_O *before* the
 Ralf> AC_PROG_CC, which was happy to overwrite CC again (don't ask me why).
 Ralf> If added after, then yes, compile is used.
[...]

I'm installing this on HEAD.

2004-09-10  Alexandre Duret-Lutz  <address@hidden>

        * 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.

Index: m4/minuso.m4
===================================================================
RCS file: /cvs/automake/automake/m4/minuso.m4,v
retrieving revision 1.7
diff -u -r1.7 minuso.m4
--- m4/minuso.m4        3 Aug 2004 23:02:55 -0000       1.7
+++ m4/minuso.m4        10 Sep 2004 20:00:34 -0000
@@ -37,4 +37,8 @@
    # 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])])
 ])
Index: tests/distname.test
===================================================================
RCS file: /cvs/automake/automake/tests/distname.test,v
retrieving revision 1.5
diff -u -r1.5 distname.test
--- tests/distname.test 14 Nov 2003 21:25:58 -0000      1.5
+++ tests/distname.test 10 Sep 2004 20:00:34 -0000
@@ -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
 
Index: tests/subdir5.test
===================================================================
RCS file: /cvs/automake/automake/tests/subdir5.test,v
retrieving revision 1.8
diff -u -r1.8 subdir5.test
--- tests/subdir5.test  14 Nov 2003 21:26:01 -0000      1.8
+++ tests/subdir5.test  10 Sep 2004 20:00:34 -0000
@@ -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 @@
 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 @@
 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
Index: tests/subdir8.test
===================================================================
RCS file: /cvs/automake/automake/tests/subdir8.test,v
retrieving revision 1.2
diff -u -r1.2 subdir8.test
--- tests/subdir8.test  24 Apr 2003 18:39:32 -0000      1.2
+++ tests/subdir8.test  10 Sep 2004 20:00:34 -0000
@@ -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 @@
 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
Index: tests/subobj.test
===================================================================
RCS file: /cvs/automake/automake/tests/subobj.test,v
retrieving revision 1.9
diff -u -r1.9 subobj.test
--- tests/subobj.test   14 Nov 2003 21:26:01 -0000      1.9
+++ tests/subobj.test   10 Sep 2004 20:00:34 -0000
@@ -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'
Index: tests/subobj4.test
===================================================================
RCS file: /cvs/automake/automake/tests/subobj4.test,v
retrieving revision 1.8
diff -u -r1.8 subobj4.test
--- tests/subobj4.test  14 Nov 2003 21:26:01 -0000      1.8
+++ tests/subobj4.test  10 Sep 2004 20:00:34 -0000
@@ -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
Index: tests/subobj5.test
===================================================================
RCS file: /cvs/automake/automake/tests/subobj5.test,v
retrieving revision 1.5
diff -u -r1.5 subobj5.test
--- tests/subobj5.test  14 Nov 2003 21:26:01 -0000      1.5
+++ tests/subobj5.test  10 Sep 2004 20:00:34 -0000
@@ -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
 
Index: tests/subobj6.test
===================================================================
RCS file: /cvs/automake/automake/tests/subobj6.test,v
retrieving revision 1.8
diff -u -r1.8 subobj6.test
--- tests/subobj6.test  14 Nov 2003 21:26:01 -0000      1.8
+++ tests/subobj6.test  10 Sep 2004 20:00:34 -0000
@@ -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 @@
 
 cat >> configure.in << 'END'
 AM_PROG_CC_C_O
-AC_PROG_CC
 AC_OUTPUT
 END
 


-- 
Alexandre Duret-Lutz