* Added distcc support

svn: 623

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@ @CC@
-LD = @CCACHE@ @CC@
-CCDEBUG = @CCACHE@ @CCDEBUG@
-LDDEBUG = @CCACHE@ @CCDEBUG@
+CC = @CCACHE@ @DISTCC@ @CC@
+LD = @CCACHE@ @DISTCC@ @CC@
+CCDEBUG = @CCACHE@ @DISTCC@ @CCDEBUG@
+LDDEBUG = @CCACHE@ @DISTCC@ @CCDEBUG@
 STRIP = @STRIP@
 
 # stuff for Tcl

autotools/configure.ac

@@ -39,6 +39,7 @@ EGG_PROG_STRIP
 EGG_PROG_AWK
 EGG_PROG_BASENAME
 EGG_PROG_CCACHE
+EGG_PROG_DISTCC
 AC_CHECK_PROG(UNAME,uname,uname)
 
 # Test the os and set the module linking settings

autotools/includes/acinclude.m4

@@ -193,6 +193,16 @@ then
 fi
 ])dnl
 
+dnl  EGG_PROG_DISTCC()
+dnl
+AC_DEFUN(EGG_PROG_DISTCC, [dnl
+AC_CHECK_PROG(DISTCC, distcc, distcc)
+if test "${DISTCC-x}" = "x"
+then
+  DISTCC=distcc
+fi
+])dnl
+
 dnl  EGG_PROG_AWK()
 dnl
 AC_DEFUN(EGG_PROG_AWK, [dnl

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.4 .
+# From configure.ac Revision: 1.5 .
 # 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 UNAME 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 CCACHE DISTCC UNAME 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.
@@ -3491,6 +3491,46 @@ then
   CCACHE=ccache
 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
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_DISTCC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$DISTCC"; then
+  ac_cv_prog_DISTCC="$DISTCC" # 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_DISTCC="distcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+DISTCC=$ac_cv_prog_DISTCC
+if test -n "$DISTCC"; then
+  echo "$as_me:$LINENO: result: $DISTCC" >&5
+echo "${ECHO_T}$DISTCC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if test "${DISTCC-x}" = "x"
+then
+  DISTCC=distcc
+fi
+
 # Extract the first word of "uname", so it can be a program name with args.
 set dummy uname; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -12995,6 +13035,7 @@ 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,@ZLIB@,$ZLIB,;t t
 s,@SSL@,$SSL,;t t