build-sys: sensible errors when autogen.sh requirements are is missing

<quote="Jim">
I tested the build on several "new" linux installs that didn't yet have any
development tools beyond gcc. On those systems the following error messages
were received:

  ./autogen.sh: line 46: libtoolize: command not found
  ./autogen.sh: line 47: test: =: unary operator expected
</quote>

This commit also removes few unnecessary empty lines, and makes all shell
variables to be wrote in caps & quoted properly.

Cc: Jim Warner <james.warner@comcast.net>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-09-26 22:27:34 +02:00
parent b7638e7ae9
commit 1b687fbaef

View File

@ -3,57 +3,47 @@
# Helps generate autoconf/automake stuff, when code is checked # Helps generate autoconf/automake stuff, when code is checked
# out from SCM. # out from SCM.
srcdir=`dirname $0` SRCDIR=$(dirname ${0})
test -z "$srcdir" && srcdir=. test -z "${SRCDIR}" && SRCDIR=.
THEDIR=`pwd` THEDIR=$(pwd)
cd $srcdir cd ${SRCDIR}
DIE=0 DIE=0
test -f top.c || { test -f top.c || {
echo
echo "You must run this script in the top-level procps-ng directory" echo "You must run this script in the top-level procps-ng directory"
echo
DIE=1 DIE=1
} }
(autoconf --version) < /dev/null > /dev/null 2>&1 || { (autoconf --version) < /dev/null > /dev/null || {
echo
echo "You must have autoconf installed to generate procps-ng build system." echo "You must have autoconf installed to generate procps-ng build system."
echo
DIE=1 DIE=1
} }
(autoheader --version) < /dev/null > /dev/null 2>&1 || { (autoheader --version) < /dev/null > /dev/null || {
echo
echo "You must have autoheader installed to generate procps-ng build system." echo "You must have autoheader installed to generate procps-ng build system."
echo "The autoheader command is part of the GNU autoconf package." echo "The autoheader command is part of the GNU autoconf package."
echo
DIE=1 DIE=1
} }
(libtool --version) < /dev/null > /dev/null 2>&1 || { (libtool --version) < /dev/null > /dev/null || {
echo
echo "You must have libtool-2 installed to generate procps-ng build system." echo "You must have libtool-2 installed to generate procps-ng build system."
echo
DIE=1 DIE=1
} }
(automake --version) < /dev/null > /dev/null 2>&1 || { (automake --version) < /dev/null > /dev/null || {
echo
echo "You must have automake installed to generate procps-ng build system." echo "You must have automake installed to generate procps-ng build system."
echo
DIE=1 DIE=1
} }
ltver=$(libtoolize --version | awk '/^libtoolize/ { print $4 }') LTVER=$(libtoolize --version | awk '/^libtoolize/ { print $4 }')
test ${ltver##2.} = "$ltver" && { LTVER=${LTVER:-"none"}
echo "You must have libtool version >= 2.x.x, but you have $ltver." test ${LTVER##2.} = "${LTVER}" && {
echo "You must have libtoolize version >= 2.x.x, but you have ${LTVER}."
DIE=1 DIE=1
} }
if test "$DIE" -eq 1; then if test ${DIE} -ne 0; then
exit 1 exit 1
fi fi
echo
echo "Generate build-system by:" echo "Generate build-system by:"
echo " aclocal: $(aclocal --version | head -1)" echo " aclocal: $(aclocal --version | head -1)"
echo " autoconf: $(autoconf --version | head -1)" echo " autoconf: $(autoconf --version | head -1)"
@ -64,15 +54,12 @@ echo " libtoolize: $(libtoolize --version | head -1)"
rm -rf autom4te.cache rm -rf autom4te.cache
set -e set -e
libtoolize --force $LT_OPTS libtoolize --force ${LT_OPTS}
aclocal -I m4 $AL_OPTS aclocal -I m4 ${AL_OPTS}
autoconf $AC_OPTS autoconf ${AC_OPTS}
autoheader $AH_OPTS autoheader ${AH_OPTS}
automake --add-missing $AM_OPTS automake --add-missing ${AM_OPTS}
cd $THEDIR
echo echo
echo "Now type '$srcdir/configure' and 'make' to compile." echo "Now type '${SRCDIR}/configure' and 'make' to compile."
echo