mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure: fix build without gtk-doc support.

Browse source 
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 <gwenole.beauchesne@intel.com>
This commit is contained in:
Javier Jardón 2012-06-28 00:39:10 +09:00 committed by Gwenole Beauchesne
parent 7eef852bdb
commit cdd33a433e
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
autogen.sh
View file

@ -20,14 +20,6 @@ if test -z $GTKDOCIZE; then
echo "EXTRA_DIST =" > gtk-doc.make echo "EXTRA_DIST =" > gtk-doc.make
else else
gtkdocize || exit $? 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 fi
AUTORECONF=`which autoreconf` AUTORECONF=`which autoreconf`

6
configure.ac
View file

@ -154,8 +154,10 @@ AC_CHECK_LIB(m, tan)
dnl Check for Gtk doc dnl Check for Gtk doc
GTKDOC_VERSION=gtkdoc_version GTKDOC_VERSION=gtkdoc_version
GTK_DOC_CHECK([$GTKDOC_VERSION]) # gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
AM_CONDITIONAL([BUILD_GTK_DOC], [test "x$enable_gtk_doc" = "xyes"]) m4_ifdef([GTK_DOC_CHECK], [
GTK_DOC_CHECK([$GTKDOC_VERSION], [--flavour no-tmpl])], [
AM_CONDITIONAL([ENABLE_GTK_DOC], [false])])
AC_SUBST(GTKDOC_VERSION) AC_SUBST(GTKDOC_VERSION)
dnl Check for GLib dnl Check for GLib

2
docs/Makefile.am
View file

@ -1,6 +1,6 @@
SUBDIRS = SUBDIRS =
if BUILD_GTK_DOC if ENABLE_GTK_DOC
SUBDIRS += reference SUBDIRS += reference
endif endif