# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1272118456 -7200
# Node ID 22d0473cd1a8ca0c8e344e949133fdf1340997aa
# Parent  cefd3d523484e35aca07567f513792e37f0140c7
ansi-c++-opt: Find correct compiler when cross-compiling.

diff --git a/ChangeLog b/ChangeLog
--- 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
--- 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 @@
     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