From 65e72938ca5c6ba5c6a5c86c881ecaecb5183539 Mon Sep 17 00:00:00 2001 From: Jordan Lee Date: Mon, 9 Apr 2012 03:00:38 +0000 Subject: [PATCH] better fix for #4826 because r13268 introduced a regression with not finding relative-path compilers. d'oh --- configure.ac | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index b1acf6d46..5f6681768 100644 --- a/configure.ac +++ b/configure.ac @@ -73,13 +73,15 @@ AC_SUBST(LIBAPPINDICATOR_MINIMUM) AC_PROG_CC AC_PROG_CXX -AC_MSG_CHECKING([for $CXX]) -if test -f "$CXX"; then +if test "x$CXX" != "x"; then # CXX is set... + if test -f "$CXX"; then # maybe it's an absolute path passed in env variables... + AC_MSG_CHECKING([for $CXX]) HAVE_CXX="yes" -else - HAVE_CXX="no" + AC_MSG_RESULT([$HAVE_CXX]) + else + AC_CHECK_PROG([HAVE_CXX],[$CXX],[yes],[no]) + fi fi -AC_MSG_RESULT([$HAVE_CXX]) AC_C_INLINE if test "x$GCC" = "xyes" ; then