# HG changeset patch
# User rubidium <rubidium@openttd.org>
# Date 2007-06-11 10:29:07
# Node ID 739b9546adfbda3fc728c25059a4ab2d824fe11d
# Parent  aa5af8fdbc45b0e861de0db3b7b137d6fe55ca4a

(svn r10091) -Add: make time detection whether you are using -jN when having distcc enabled.

diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,10 +31,14 @@ OS = !!OS!!
 OSXAPP = !!OSXAPP!!
 REVISION = !!REVISION!!
 AWK = !!AWK!!
+DISTCC = !!DISTCC!!
 
 RES := $(shell if ! [ -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST)`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi )
 
 all: config.cache
+ifdef DISTCC
+	@if [ -z "`echo '$(MFLAGS)' | grep '\-j'`" ]; then echo; echo "WARNING: you enabled distcc support, but you don't seem to be using the -jN paramter"; echo; fi
+endif
 	@for dir in $(DIRS); do \
 		$(MAKE) -C $$dir all; \
 	done
diff --git a/config.lib b/config.lib
--- a/config.lib
+++ b/config.lib
@@ -531,6 +531,7 @@ check_params() {
 	if [ "$with_distcc" != "0" ]; then
 		res="`$distcc --version 2>/dev/null | head -n 1 | cut -b 0-6`"
 		if [ "$res" != "distcc" ]; then
+			distcc=""
 			log 1 "checking distcc... no"
 			if [ "$with_distcc" = "2" ]; then
 				log 1 "configure: error: no distcc detected, but was forced to be used"
@@ -1935,6 +1936,7 @@ make_sed() {
 		s#!!AWK!!#$awk#g;
 		s#!!GCC295!!#$gcc295#g;
 		s#!!ENABLE_INSTALL!!#$enable_install#g;
+		s#!!DISTCC!!#$distcc#g;
 	"
 }