X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=autogen.sh;h=caf1401d8bf02e2d299bdcdf58ae902cfb260092;hp=a047f7c4d9f0bc704ade2ed049118c0eb3e02f7f;hb=04c16387cc13317ded03ce478b131d94558f585f;hpb=65a0002eb560b7248cbb0b4f143d00053b66bccc

diff --git a/autogen.sh b/autogen.sh
index a047f7c4..caf1401d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,13 +1,28 @@
 #!/bin/sh
-echo preparing...
+# check if we have multiple processors/cores
+n=$(nproc 2>/dev/null)
+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
+	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 > /dev/null
+make clean > /dev/null 2>&1
+make -j $n > /dev/null && make check