[systemd-commits] 2 commits - autogen.sh configure.ac Makefile.am

[Kay Sievers]

 Makefile.am  |   10 +++++++++-
 autogen.sh   |   12 ++++++++++--
 configure.ac |    7 ++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

New commits:
commit 80a5cbace45a6adbf2f9119edc5a4b10db493064
Author: Kay Sievers <kay at vrfy.org>
Date:   Tue Apr 17 17:03:38 2012 +0200

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

diff --git a/Makefile.am b/Makefile.am
index e8172bc..7e6f520 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 869632a..d27b5c6 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 5a4fc84..67c5e00 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])
 

commit 92ec4495f76a7a2a6c31f5bb2a5240f78dcfe1d2
Author: Javier Jardón <jjardon at gnome.org>
Date:   Tue Apr 17 15:17:27 2012 +0100

    build-sys: make gtk-doc dependency optional

diff --git a/Makefile.am b/Makefile.am
index 13c4ed1..e8172bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1276,8 +1276,10 @@ EXTRA_DIST += \
 	src/libsystemd-daemon/libsystemd-daemon.sym
 
 # ------------------------------------------------------------------------------
+if ENABLE_GTK_DOC
 SUBDIRS += \
 	docs/libudev
+endif
 
 include_HEADERS += \
 	src/libudev/libudev.h
@@ -1625,8 +1627,10 @@ dist_udevrules_DATA += \
 
 # ------------------------------------------------------------------------------
 if ENABLE_GUDEV
+if ENABLE_GTK_DOC
 SUBDIRS += \
 	docs/gudev
+endif
 
 libgudev_includedir = \
 	$(includedir)/gudev-1.0/gudev
diff --git a/autogen.sh b/autogen.sh
index 0e1b5be..869632a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,7 +21,17 @@ if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
     echo "Activated pre-commit hook."
 fi
 
-gtkdocize
+GTKDOCIZE=`which gtkdocize`
+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 'EXTRA_DIST =' > gtk-doc.make
+fi
+
+if test -z "$NOGTKDOC"; then
+    gtkdocize || exit $?
+fi
 intltoolize --force --automake
 autoreconf --force --install --symlink
 
diff --git a/configure.ac b/configure.ac
index 2e766a6..5a4fc84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,16 @@ AM_PROG_CC_C_O
 AC_PROG_GCC_TRADITIONAL
 
 AC_PATH_PROG([M4], [m4])
-GTK_DOC_CHECK(1.10)
+
+# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
+# it on it's own line.
+m4_ifdef([GTK_DOC_CHECK], [
+GTK_DOC_CHECK([1.18])
+],[
+AM_CONDITIONAL([ENABLE_GTK_DOC],[false])
+])
+
+
 GOBJECT_INTROSPECTION_CHECK([1.31.1])
 
 AC_CHECK_TOOL(OBJCOPY, objcopy)