fixed detection of missing C++ compiler added in last commit

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index 88a338da0c82e2565bd0d252a6748fac46980430..f98ee0dc7f9578143d54ba55c4c2355ab823cbf9 100755 (executable)
--- a/configure
+++ b/configure
@@ -16316,7 +16316,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
 
 
 

-if test -n "$ac_cv_prog_ac_ct_CXX"; then
+if test "$CXX" = "g++" -a "$GXX" != "yes"; then

     { { echo "$as_me:$LINENO: error: C++ compiler is needed to build wxWidgets" >&5
 echo "$as_me: error: C++ compiler is needed to build wxWidgets" >&2;}
    { (exit 1); exit 1; }; }
     { { echo "$as_me:$LINENO: error: C++ compiler is needed to build wxWidgets" >&5
 echo "$as_me: error: C++ compiler is needed to build wxWidgets" >&2;}
    { (exit 1); exit 1; }; }

diff --git a/configure.in b/configure.in
index 910d20328e9b69b7e5b883bdb4da23edac96f159..7ce40d8ff76a5658d77a91bf6c7863f8b45abfb7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1473,7 +1473,7 @@ AC_BAKEFILE_PROG_CXX
 dnl configure always sets CXX to something as it falls back to g++ even if no
 dnl C++ compiler was found, but we prefer to abort now with a clear error
 dnl message rather than give errors about all tests failures below
 dnl configure always sets CXX to something as it falls back to g++ even if no
 dnl C++ compiler was found, but we prefer to abort now with a clear error
 dnl message rather than give errors about all tests failures below

-if test -n "$ac_cv_prog_ac_ct_CXX"; then
+if test "$CXX" = "g++" -a "$GXX" != "yes"; then

     AC_MSG_ERROR([C++ compiler is needed to build wxWidgets])
 fi
 
     AC_MSG_ERROR([C++ compiler is needed to build wxWidgets])
 fi