soc.2008.masterpassword: d936cec6: Ensure the C++ compiler can actually be ...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: d936cec62f2fb881a134401b50b703c14037a8c1
Parent:   94706849149aec3b8ada0cab41a091ffa25e8bfe
Author:   qulogic at pidgin.im
Date:     02/02/12 19:48:17
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/d936cec62f2fb881a134401b50b703c14037a8c1

Changelog: 

Ensure the C++ compiler can actually be run. AC_PROG_CXX does not
require the compiler if AC_PROG_CC is called before it. This is
good, because we don't require a C++ compiler if not using the
KWallet plugin. This change ensures we get a proper error instead
of a "headers not found" error.

Changes against parent 94706849149aec3b8ada0cab41a091ffa25e8bfe

  patched  configure.ac

-------------- next part --------------
============================================================
--- configure.ac	d603a883c0c9395af37932f984201839ceb13f3b
+++ configure.ac	4209fdd20a723ce37fbc588fc25f315c32de7c5f
@@ -1398,6 +1398,17 @@ if test "x$enable_kwallet" = "xyes"; the
 AC_ARG_WITH(kwallet-libs, [AC_HELP_STRING([--with-kwallet-libs=DIR], [compile the KWallet plugin against the KWallet libs in DIR])], [ac_kwallet_libs="$withval"], [ac_kwallet_libs="no"])
 
 if test "x$enable_kwallet" = "xyes"; then
+	dnl Ensure C++ compiler works
+	AC_CHECK_PROG(CXXTEST, [$CXX], [$CXX])
+	if test "x$CXXTEST" = "x"; then
+		if test "x$force_deps" = "xyes"; then
+			AC_MSG_ERROR([
+A C++ compiler was not found.
+Use --disable-kwallet if you do not need KWallet support.
+])
+		fi
+	fi
+
 	KWALLET_CXXFLAGS=""
 	KWALLET_LIBS=""
 	if test -z "$with_kwallet_includes" || test -z "$with_kwallet_libs"; then