summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-04-17 17:03:38 +0200
committerKay Sievers <kay@vrfy.org>2012-04-17 17:11:02 +0200
commit80a5cbace45a6adbf2f9119edc5a4b10db493064 (patch)
treeab0384a6f771f8caae15d6f9ce29b37d134eec7a
parent92ec4495f76a7a2a6c31f5bb2a5240f78dcfe1d2 (diff)
build-sys: silence gtk-doc check, remove gtk-doc options from configure and distcheck
-rw-r--r--Makefile.am6
-rwxr-xr-xautogen.sh14
-rw-r--r--configure.ac8
3 files changed, 13 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am
index e8172bc514..7e6f52074a 100644
--- 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 869632abb0..d27b5c6764 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 \
diff --git a/configure.ac b/configure.ac
index 5a4fc84588..67c5e007c6 100644
--- 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])