Simplify autogen.sh.

This script is expected to perform only the autoconf specific setup,
but not run configure, make or the test suite, so remove everything
which is not related to autoconf.

People who prefer to run everything in one go can easily do so by
writing their own script, for example autogen-local.sh. Add a line
to .gitignore which ignores files matching *-local* to prevent such
files from showing up in git status.

diff --git a/.gitignore b/.gitignore
index bd5e04801c4bec2714dd515810296f1bc89cbab0..8f8d0af736cee205b638502171eea526d613cc22 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ confdefs.h
 conftest
 conftest.c
 git-version.h
+*-local*

diff --git a/autogen.sh b/autogen.sh
index caf1401d8bf02e2d299bdcdf58ae902cfb260092..cbfea7fdfb2ea5e2b8ad84c8faba815b67b8a966 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,28 +1,8 @@
 #!/bin/sh
-# 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 2>&1
-fi
 autom4te \
        --language=autoconf \
        --output=configure \
        --no-cache \
        --warnings=all \
-       configure.ac
+       configure.ac &&
 autoheader
-echo configuring...
-./configure $@ > /dev/null
-echo compiling...
-make clean > /dev/null 2>&1
-make -j $n > /dev/null && make check