Do not use ccache when --enable-icecream is given.

1 files changed, 7 insertions, 6 deletions

diff --git a/configure.in b/configure.in
index f245355bd265..841bb986c19e 100755
--- a/configure.in
+++ b/configure.in
@@ -451,10 +451,11 @@ AC_ARG_ENABLE(zenity,
 AC_ARG_ENABLE(ccache,
     AS_HELP_STRING([--disable-ccache],
         [Do not try to use ccache automatically.
-    by default, we will try to detect if ccache is available and if CC/CXX where
-    not already set, we attemtp to use ccache. --disable-ccache prevent this behavior.
+         By default, we will try to detect if ccache is available; in that case if
+         CC/CXX are not yet set, and --enable-icecream is not given, we
+         attempt to use ccache. --disable-ccache disables ccache completely.
 ]),
-,enable_ccache=yes)
+,)
 
 AC_ARG_ENABLE(cl-x64,
     AS_HELP_STRING([--enable-cl-x64],
@@ -1686,7 +1687,7 @@ fi
 dnl ===================================================================
 dnl  Checks if ccache is available
 dnl ===================================================================
-if test "$enable_ccache" = "yes" ; then
+if test "$enable_ccache" = "yes" -o \( "$enable_ccache" = "" -a "$enable_icecream" != "yes" \) ; then
     if test -z "$CC" ; then
         if test -z "$CXX" ; then
             AC_PATH_PROG([CCACHE],[ccache],[not found])
@@ -1730,7 +1731,7 @@ dnl ===================================================================
 GCC_HOME_SET="true"
 AC_MSG_CHECKING([gcc home])
 if test -z "$with_gcc_home"; then
-    if test -n "$enable_icecream" && test "$enable_icecream" != "no" ; then
+    if test "$enable_icecream" = "yes" ; then
         GCC_HOME="/opt/icecream"
     else
         GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,`
@@ -9019,7 +9020,7 @@ BUILD_MAX_JOBS="1"
 if test "z$with_max_jobs" != "z"; then
     BUILD_MAX_JOBS="$with_max_jobs"
 else
-    if test -n "$enable_icecream" && test "$enable_icecream" != "no" ; then
+    if test "$enable_icecream" = "yes" ; then
         BUILD_MAX_JOBS="10"
     fi
 fi