X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=d27b5c676420bf43cd6abc621c8847527ba9a79e;hp=869632abb09886ffda98827e0ca89a94c66e9827;hb=3d9a412243035beeaaf3465a62065444a5adf21c;hpb=92ec4495f76a7a2a6c31f5bb2a5240f78dcfe1d2

diff --git a/autogen.sh b/autogen.sh
index 869632abb..d27b5c676 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,17 +21,15 @@ if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
     echo "Activated pre-commit hook."
 fi
 
-GTKDOCIZE=`which gtkdocize`
+GTKDOCIZE=$(which gtkdocize 2>/dev/null)
 if test -z $GTKDOCIZE; then
-    echo "You don't have gtk-doc installed, and thus"
-    echo "won't be able to generate the documentation."
-    NOGTKDOC=1
+    echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
     echo 'EXTRA_DIST =' > gtk-doc.make
+else
+    gtkdocize
+    gtkdocargs=--enable-gtk-doc
 fi
 
-if test -z "$NOGTKDOC"; then
-    gtkdocize || exit $?
-fi
 intltoolize --force --automake
 autoreconf --force --install --symlink
 
@@ -44,7 +42,7 @@ args="\
 --localstatedir=/var \
 --libdir=$(libdir /usr/lib) \
 --libexecdir=/usr/lib \
---enable-gtk-doc"
+$gtkdocargs"
 
 if [ ! -L /bin ]; then
 args="$args \