* Added ccache support back into the build

svn: 1889

Makefile.in

@@ -22,10 +22,10 @@ EXCLUDES = pack/pack.cfg misc/ind doc/DEVEL src/Makefile src/compat/Makefile src
            misc/plainh misc/grep misc/cp.sh
 
 # defaults
-CXX = @DISTCC@ @CXX@
-LD = @DISTCC@ @CXX@
-CCDEBUG = @DISTCC@ @CCDEBUG@
-LDDEBUG = @DISTCC@ @CCDEBUG@
+CXX = @CCACHE@ @DISTCC@ @CXX@
+LD = @CXX@
+CCDEBUG = @CCACHE@ @DISTCC@ @CCDEBUG@
+LDDEBUG = @CCDEBUG@
 STRIP = @STRIP@
 DIFF = @DIFF@
 

autotools/configure.ac

@@ -45,7 +45,7 @@ AC_CHECK_PROG(OBJCOPY, objcopy, [objcopy --remove-section=.note --remove-section
 AC_CHECK_PROG(STRIP, strip, strip, touch)
 AC_CHECK_PROG(DIFF, gdiff, gdiff, diff)
 AC_CHECK_PROG(UNAME, uname, uname)
-#AC_CHECK_PROG(CCACHE, ccache, ccache)
+AC_CHECK_PROG(CCACHE, ccache, ccache)
 AC_CHECK_PROG(DISTCC, distcc, distcc)
 
 # Test the os and set the module linking settings

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.41 .
+# From configure.ac Revision: 1.42 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -313,7 +313,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CXXCPP EGREP CCDEPMODE GCC3 SET_MAKE HEAD_1 AWK BASENAME OBJCOPY STRIP DIFF UNAME DISTCC CCDEBUG ZLIB LIBOBJS VERSION NUMVER MOD_UPDIR LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CXXCPP EGREP CCDEPMODE GCC3 SET_MAKE HEAD_1 AWK BASENAME OBJCOPY STRIP DIFF UNAME CCACHE DISTCC CCDEBUG ZLIB LIBOBJS VERSION NUMVER MOD_UPDIR LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3279,7 +3279,41 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
-#AC_CHECK_PROG(CCACHE, ccache, ccache)
+# Extract the first word of "ccache", so it can be a program name with args.
+set dummy ccache; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CCACHE+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CCACHE"; then
+  ac_cv_prog_CCACHE="$CCACHE" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CCACHE="ccache"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CCACHE=$ac_cv_prog_CCACHE
+if test -n "$CCACHE"; then
+  echo "$as_me:$LINENO: result: $CCACHE" >&5
+echo "${ECHO_T}$CCACHE" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
 # Extract the first word of "distcc", so it can be a program name with args.
 set dummy distcc; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -11285,6 +11319,7 @@ s,@OBJCOPY@,$OBJCOPY,;t t
 s,@STRIP@,$STRIP,;t t
 s,@DIFF@,$DIFF,;t t
 s,@UNAME@,$UNAME,;t t
+s,@CCACHE@,$CCACHE,;t t
 s,@DISTCC@,$DISTCC,;t t
 s,@CCDEBUG@,$CCDEBUG,;t t
 s,@ZLIB@,$ZLIB,;t t