From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 20 May 2006 15:49:27 +0000 (+0000)
Subject: * lib/autoconf/c.m4 (AC_PROG_CXX_C_O): Require AC_PROG_CXX,
X-Git-Tag: AUTOCONF-2.59d~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8362e4e987e20671b8a3b4fc14e2d54fbd8ad00e;p=thirdparty%2Fautoconf.git

* lib/autoconf/c.m4 (AC_PROG_CXX_C_O): Require AC_PROG_CXX,
and set the language to C++ (analogous to the equivalent Fortran
tests).
---

diff --git a/ChangeLog b/ChangeLog
index 8e78888c2..af7998fe2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-05-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	* lib/autoconf/c.m4 (AC_PROG_CXX_C_O): Require AC_PROG_CXX,
+	and set the language to C++ (analogous to the equivalent Fortran
+	tests).
+
 	* lib/autoconf/c.m4 (AC_PROG_CXX_C_O): New macro.
 	* doc/autoconf.texi (C++ Compiler): Document it.
 	* lib/autoconf/fortran.m4 (_AC_PROG_FC_C_O): Adjust comment.
diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index 58c915a59..2f16d035f 100644
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -829,7 +829,8 @@ fi[]dnl
 # Test if the C++ compiler accepts the options `-c' and `-o'
 # simultaneously, and define `CXX_NO_MINUS_C_MINUS_O' if it does not.
 AC_DEFUN([AC_PROG_CXX_C_O],
-[AC_LANG_ASSERT([C++])dnl
+[AC_REQUIRE([AC_PROG_CXX])dnl
+AC_LANG_PUSH([C++])dnl
 AC_CACHE_CHECK([whether $CXX understands -c and -o together],
                [ac_cv_prog_cxx_c_o],
 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
@@ -850,6 +851,7 @@ if test $ac_cv_prog_cxx_c_o = no; then
             [Define to 1 if your C++ compiler doesn't accept
              -c and -o together.])
 fi
+AC_LANG_POP([C++])dnl
 ])# AC_PROG_CXX_C_O