autogen.sh: tweak program checking logic
With the errexit bash option turned on, these conditionals would never actually be reached since the failure from `which` would cause the script to exit. As a result, if autoreconf was not installed, all the user would see would be the error message from `which`, and not pretty error we have for them. Similarly, even though gtk-doc should be optional, the script would fail if gtkdocize wasn't installed. Also fix minor typo.
This commit is contained in:
parent
73f2a7f058
commit
077f83edfd
@ -7,16 +7,14 @@ test -n "$srcdir" || srcdir=.
|
||||
olddir=`pwd`
|
||||
cd $srcdir
|
||||
|
||||
AUTORECONF=`which autoreconf`
|
||||
if test -z $AUTORECONF; then
|
||||
echo "*** No autoreconf found, please intall it ***"
|
||||
if ! which autoreconf 2>/dev/null; then
|
||||
echo "*** No autoreconf found, please install it ***"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p m4
|
||||
|
||||
GTKDOCIZE=$(which gtkdocize 2>/dev/null)
|
||||
if test -z $GTKDOCIZE; then
|
||||
if ! which gtkdocize 2>/dev/null; then
|
||||
echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
|
||||
rm -f gtk-doc.make
|
||||
cat > gtk-doc.make <<EOF
|
||||
|
Loading…
Reference in New Issue
Block a user