X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=autogen.sh;h=caf1401d8bf02e2d299bdcdf58ae902cfb260092;hp=e5000a6fd70cddc63b1f2a2dc21f54bc760641bc;hb=85ec8f30f6bef37a9a3bc2b84314654648f2f81c;hpb=5379c6d7b5368100184792219248b48580755aae

diff --git a/autogen.sh b/autogen.sh
index e5000a6f..caf1401d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,15 +5,24 @@ if [ -z "$n" ]; then
 	n=$(grep ^processor /proc/cpuinfo 2>/dev/null | wc -l)
 	[ $n -eq 0 ] && n=1
 fi
+# If we are compiling with distcc, try to guess a reasonable number
+# based on (a) the number of cores on this machine and (b) the number
+# of words in the DISTCC_HOSTS variable.
+d="$(echo $DISTCC_HOSTS | wc -w)"
+n=$(($n + 2 * $n * $d))
 echo preparing, parallel=$n...
 if test -f Makefile; then
 	make maintainer-clean > /dev/null 2>&1
 fi
-aclocal -I . > /dev/null 2>&1
-autoconf
+autom4te \
+	--language=autoconf \
+	--output=configure \
+	--no-cache \
+	--warnings=all \
+	configure.ac
 autoheader
 echo configuring...
 ./configure $@ > /dev/null
 echo compiling...
-make clean2 > /dev/null 2>&1
-make -j $n > /dev/null
+make clean > /dev/null 2>&1
+make -j $n > /dev/null && make check