From b8df76249da5f4d584cab9947f501d469f912a5f Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 10 Sep 2004 20:03:28 +0000 Subject: [PATCH] * 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. --- ChangeLog | 7 +++++++ m4/minuso.m4 | 4 ++++ tests/distname.test | 4 ++-- tests/subdir5.test | 5 ++--- tests/subdir8.test | 4 ++-- tests/subobj.test | 4 ++-- tests/subobj4.test | 4 ++-- tests/subobj5.test | 4 ++-- tests/subobj6.test | 3 +-- 9 files changed, 24 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23f23e8df..10f2e1df2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2004-09-10 Alexandre Duret-Lutz + * 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 d111b53ca..92049b641 100644 --- 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 fb051f14a..b5ae037fe 100755 --- 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 15fb5a0e3..b19ffb446 100755 --- 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 ed8610d04..66367a51e 100755 --- 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 e170522d4..a3c378027 100755 --- 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 440e128ef..f78a36c5c 100755 --- 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 90ff0f57b..231a44032 100755 --- 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 7ed32526f..22ea8c169 100755 --- 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 -- 2.47.2