keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

autogen.sh: tweak program checking logic

Browse Source 
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:
Jonathan Lebon 2015-09-01 14:34:57 -04:00
parent 73f2a7f058
commit 077f83edfd
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autogen.sh
View File

@ -7,16 +7,14 @@ test -n "$srcdir" || srcdir=.
olddir=`pwd` olddir=`pwd`
cd $srcdir cd $srcdir
AUTORECONF=`which autoreconf` if ! which autoreconf 2>/dev/null; then
if test -z $AUTORECONF; then echo "*** No autoreconf found, please install it ***"
echo "*** No autoreconf found, please intall it ***"
exit 1 exit 1
fi fi
mkdir -p m4 mkdir -p m4
GTKDOCIZE=$(which gtkdocize 2>/dev/null) if ! which gtkdocize 2>/dev/null; then
if test -z $GTKDOCIZE; then
echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation." echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
rm -f gtk-doc.make rm -f gtk-doc.make
cat > gtk-doc.make <<EOF cat > gtk-doc.make <<EOF