From cdd33a433ecf089f38dc113dab9387dea5e5676e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20Jard=C3=B3n?= Date: Thu, 28 Jun 2012 00:39:10 +0900 Subject: [PATCH] configure: fix build without gtk-doc support. Also do not generate tamplate files as all the documentation is inline. Drop un-needed code in autogen.sh as well. Signed-off-by: Gwenole Beauchesne --- autogen.sh | 8 -------- configure.ac | 6 ++++-- docs/Makefile.am | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/autogen.sh b/autogen.sh index 7f9a198..3032585 100755 --- a/autogen.sh +++ b/autogen.sh @@ -20,14 +20,6 @@ if test -z $GTKDOCIZE; then echo "EXTRA_DIST =" > gtk-doc.make else gtkdocize || exit $? - # we need to patch gtk-doc.make to support pretty output with - # libtool 1.x. Should be fixed in the next version of gtk-doc. - # To be more resilient with the various versions of gtk-doc one - # can find, just sed gkt-doc.make rather than patch it. - sed -e 's#) --mode=compile#) --tag=CC --mode=compile#' gtk-doc.make > gtk-doc.temp \ - && mv gtk-doc.temp gtk-doc.make - sed -e 's#) --mode=link#) --tag=CC --mode=link#' gtk-doc.make > gtk-doc.temp \ - && mv gtk-doc.temp gtk-doc.make fi AUTORECONF=`which autoreconf` diff --git a/configure.ac b/configure.ac index 9a6c89a..eaeebf8 100644 --- a/configure.ac +++ b/configure.ac @@ -154,8 +154,10 @@ AC_CHECK_LIB(m, tan) dnl Check for Gtk doc GTKDOC_VERSION=gtkdoc_version -GTK_DOC_CHECK([$GTKDOC_VERSION]) -AM_CONDITIONAL([BUILD_GTK_DOC], [test "x$enable_gtk_doc" = "xyes"]) +# gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line +m4_ifdef([GTK_DOC_CHECK], [ +GTK_DOC_CHECK([$GTKDOC_VERSION], [--flavour no-tmpl])], [ +AM_CONDITIONAL([ENABLE_GTK_DOC], [false])]) AC_SUBST(GTKDOC_VERSION) dnl Check for GLib diff --git a/docs/Makefile.am b/docs/Makefile.am index 516af70..58bb287 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = -if BUILD_GTK_DOC +if ENABLE_GTK_DOC SUBDIRS += reference endif -- 2.7.4