build-sys: silence gtk-doc check, remove gtk-doc options from configure and distcheck

diff --git a/Makefile.am b/Makefile.am
index e8172bc51460ae18a0b1c9c8c3ce394975278579..7e6f52074a56ed3252e76a4d198d6552ce469a26 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3237,8 +3237,12 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
        --with-rootprefix=$$dc_install_base \
-       --disable-split-usr \
+       --disable-split-usr
+
+if ENABLE_GTK_DOC
+DISTCHECK_CONFIGURE_FLAGS += \
        --enable-gtk-doc
+endif
 
 upload: all distcheck
        cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/

diff --git a/autogen.sh b/autogen.sh
index 869632abb09886ffda98827e0ca89a94c66e9827..d27b5c676420bf43cd6abc621c8847527ba9a79e 100755 (executable)
--- 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 \

diff --git a/configure.ac b/configure.ac
index 5a4fc84588a265d7c6e309f229a002e34c6244fe..67c5e007c6faf83db93d581382a4fb37c9c767ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -62,14 +62,10 @@ AC_PROG_GCC_TRADITIONAL
 
 AC_PATH_PROG([M4], [m4])
 
-# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
-# it on it's own line.
+# gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
 m4_ifdef([GTK_DOC_CHECK], [
 GTK_DOC_CHECK([1.18])
-],[
-AM_CONDITIONAL([ENABLE_GTK_DOC],[false])
-])
-
+],[ AM_CONDITIONAL([ENABLE_GTK_DOC],[false]) ])
 
 GOBJECT_INTROSPECTION_CHECK([1.31.1])