gnome-games r7294 - trunk

[chpe svn gnome org]

Author: chpe
Date: Thu Jan 31 12:00:32 2008
New Revision: 7294
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7294&view=rev

Log:
2008-01-31  Christian Persch  <chpe gnome org>

	* configure.in: Change check for C++ compiler to use
	AC_COMPILE_IFELSE. Should fix bug #513336.

Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Jan 31 12:00:32 2008
@@ -146,10 +146,19 @@
 
 AC_PROG_CC
 AC_PROG_CPP
-AC_PROG_CXX
 AC_PROG_LN_S
 AC_PROG_SED
 
+if test "$need_cxx" = "yes"; then
+  AC_PROG_CXX
+
+  # Check whether a C++ was found (AC_PROG_CXX sets $CXX to "g++" even when it
+  # doesn't exist)
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[],[AC_MSG_ERROR([No C++ compiler found])])
+  AC_LANG_POP([C++])
+fi
+
 # Run these before AC_PROG_LIBTOOL, else it bugs
 AC_GGZ_INIT
 AC_GGZ_PLATFORM_BASE
@@ -159,13 +168,6 @@
 
 AC_PROG_LIBTOOL
 
-# See if C++ support is actually there
-AC_CHECK_PROG([have_cxx],[$CXX],[yes],[no])
-
-if test "$need_cxx" = "yes" -a "$have_cxx" != "yes"; then
-  AC_MSG_ERROR([No C++ compiler found; either install one or use --enable-omitgames=gnometris,blackjack])
-fi
-
 GNOME_COMMON_INIT
 GNOME_COMPILE_WARNINGS([maximum])
 GNOME_CXX_WARNINGS([yes])