Explorar o código

* Removed ccache, it was buggy with my .deps

svn: 648
Bryan Drewery %!s(int64=22) %!d(string=hai) anos
pai
achega
04ef0d940c
Modificáronse 3 ficheiros con 8 adicións e 48 borrados
  1. 4 4
      Makefile.in
  2. 1 1
      autotools/configure.ac
  3. 3 43
      configure

+ 4 - 4
Makefile.in

@@ -23,10 +23,10 @@ EXCLUDES = pack/pack.cfg misc/ind doc/DEVEL src/Makefile src/compat/Makefile src
            misc/plainh misc/grep misc/cp.sh src/settings.c src/salt.h 
 
 # defaults
-CC = @CCACHE@ @DISTCC@ @CC@
-LD = @CCACHE@ @DISTCC@ @CC@
-CCDEBUG = @CCACHE@ @DISTCC@ @CCDEBUG@
-LDDEBUG = @CCACHE@ @DISTCC@ @CCDEBUG@
+CC = @DISTCC@ @CC@
+LD = @DISTCC@ @CC@
+CCDEBUG = @DISTCC@ @CCDEBUG@
+LDDEBUG = @DISTCC@ @CCDEBUG@
 STRIP = @STRIP@
 
 # stuff for Tcl

+ 1 - 1
autotools/configure.ac

@@ -38,7 +38,7 @@ EGG_PROG_HEAD_1
 EGG_PROG_STRIP
 EGG_PROG_AWK
 EGG_PROG_BASENAME
-EGG_PROG_CCACHE
+#EGG_PROG_CCACHE
 EGG_PROG_DISTCC
 AC_CHECK_PROG(UNAME,uname,uname)
 

+ 3 - 43
configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.9 .
+# From configure.ac Revision: 1.10 .
 # 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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CCDEPMODE CCDEBUG SET_MAKE HEAD_1 STRIP AWK BASENAME CCACHE DISTCC UNAME RESLIB RESINCLUDE ZLIB SSL LIBOBJS TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS VERSION NUMVER PACKNAME 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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CCDEPMODE CCDEBUG SET_MAKE HEAD_1 STRIP AWK BASENAME DISTCC UNAME RESLIB RESINCLUDE ZLIB SSL LIBOBJS TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS VERSION NUMVER PACKNAME MOD_UPDIR LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3451,46 +3451,7 @@ EOF
   exit 1
 fi
 
-# 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
-
-if test "${CCACHE-x}" = "x"
-then
-  CCACHE=ccache
-fi
-
+#EGG_PROG_CCACHE
 # 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
@@ -14025,7 +13986,6 @@ s,@HEAD_1@,$HEAD_1,;t t
 s,@STRIP@,$STRIP,;t t
 s,@AWK@,$AWK,;t t
 s,@BASENAME@,$BASENAME,;t t
-s,@CCACHE@,$CCACHE,;t t
 s,@DISTCC@,$DISTCC,;t t
 s,@UNAME@,$UNAME,;t t
 s,@RESLIB@,$RESLIB,;t t