Merge pull request #37 from darnir/darnir

Fix Shebang line and other issues with autogen.sh

The shebang line was not being interpreted due to a space between # and !. On
fixing it, smaller issues came to the fore due to the effects of the -e switch.
Fixed them all.
This commit is contained in:
Tim Rühsen 2015-12-03 10:21:08 +01:00
commit da94ada284
1 changed files with 6 additions and 6 deletions

View File

@ -1,21 +1,21 @@
#!/bin/sh -e #!/bin/sh -e
AUTORECONF=`which autoreconf 2>/dev/null` AUTORECONF=$(which autoreconf 2>/dev/null || true)
if test $? -ne 0; then if test $? -ne 0; then
echo "No 'autoreconf' found. You must install the autoconf package." echo "No 'autoreconf' found. You must install the autoconf package."
exit 1 exit 1
fi fi
GIT=`which git 2>/dev/null` GIT=$(which git 2>/dev/null || true)
if test $? -ne 0; then if test $? -ne 0; then
echo "No 'git' found. You must install the git package." echo "No 'git' found. You must install the git package."
exit 1 exit 1
fi fi
# create m4 before gtkdocize # create m4 before gtkdocize
mkdir m4 2>/dev/null mkdir m4 2>/dev/null || true
GTKDOCIZE=`which gtkdocize 2>/dev/null` GTKDOCIZE=$(which gtkdocize 2>/dev/null || true)
if test $? -ne 0; then if test $? -ne 0; then
echo "No gtk-doc support found. You can't build the docs." echo "No gtk-doc support found. You can't build the docs."
# rm because gtk-doc.make might be a link to a protected file # rm because gtk-doc.make might be a link to a protected file
@ -29,7 +29,7 @@ fi
$GIT submodule init $GIT submodule init
$GIT submodule update $GIT submodule update
$AUTORECONF --install --force --symlink || exit $? $AUTORECONF --install --force --symlink
echo echo
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"