From: Bruno Haible <bruno@clisp.org>
Date: Sat, 24 Apr 2010 14:14:16 +0000 (+0200)
Subject: ansi-c++-opt: Find correct compiler when cross-compiling.
X-Git-Tag: v0.1~4229
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=70f388252814c165b1d7262fa7f42db70900b640;p=gnulib.git

ansi-c++-opt: Find correct compiler when cross-compiling.
---

diff --git a/ChangeLog b/ChangeLog
index 590ca2d3f..c88ea6a77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-24  Bruno Haible  <bruno@clisp.org>
+
+	ansi-c++-opt: Find correct compiler when cross-compiling.
+	* m4/ansi-c++.m4 (gl_PROG_ANSI_CXX): Use AC_CHECK_TOOLS instead of
+	AC_CHECK_PROGS.
+	Reported by Simon Josefsson.
+
 2010-04-24  Giuseppe Scrivano  <gscrivano@gnu.org>
 
 	vc-list-files: Add support for subversion
diff --git a/m4/ansi-c++.m4 b/m4/ansi-c++.m4
index b8bd73fb2..0b024379f 100644
--- a/m4/ansi-c++.m4
+++ b/m4/ansi-c++.m4
@@ -1,4 +1,4 @@
-# ansi-c++.m4 serial 4
+# ansi-c++.m4 serial 5
 dnl Copyright (C) 2002-2003, 2005, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -48,7 +48,9 @@ AC_DEFUN([gl_PROG_ANSI_CXX],
     if test -n "$CCC"; then
       CXX="$CCC"
     else
-      AC_CHECK_PROGS([CXX], [g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC], [:])
+      AC_CHECK_TOOLS([CXX],
+                     [g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC],
+                     [:])
     fi
   fi
   if test "$CXX" != ":"; then