luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 05:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make gtk-doc not a hard dependency of GLib

Browse Source 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=674314
This commit is contained in:
Javier Jardón 2012-04-17 12:59:11 +01:00
parent 10fc00b385
commit 0f6a092cc5
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
autogen.sh
View File

@ -7,10 +7,13 @@ test -n "$srcdir" || srcdir=.
olddir=`pwd` olddir=`pwd`
cd "$srcdir" cd "$srcdir"
GTKDOCIZE=`which gtkdocize` GTKDOCIZE=$(which gtkdocize 2>/dev/null)
if test -z $GTKDOCIZE; then if test -z $GTKDOCIZE; then
echo "*** No GTK-Doc found, please install it ***" echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
exit 1 rm -f gtk-doc.make
echo 'EXTRA_DIST =' > gtk-doc.make
else
gtkdocize || exit $?
fi fi
AUTORECONF=`which autoreconf` AUTORECONF=`which autoreconf`
@ -24,7 +27,6 @@ fi
# regenerated from their corresponding *.in files by ./configure anyway. # regenerated from their corresponding *.in files by ./configure anyway.
touch README INSTALL touch README INSTALL
gtkdocize || exit $?
autoreconf --force --install --verbose || exit $? autoreconf --force --install --verbose || exit $?
cd "$olddir" cd "$olddir"

7
configure.ac
View File

@ -2585,8 +2585,13 @@ AS_IF([ test $cross_compiling = yes && test x$enable_modular_tests = xyes], [
dnl ************************** dnl **************************
dnl *** Checks for gtk-doc *** dnl *** Checks for gtk-doc ***
dnl ************************** dnl **************************
# 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.15], [--flavour no-tmpl]) GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
],[
AM_CONDITIONAL([ENABLE_GTK_DOC],[false])
])
AC_ARG_ENABLE(man, AC_ARG_ENABLE(man,
[AC_HELP_STRING([--enable-man], [AC_HELP_STRING([--enable-man],

2
docs/Makefile.am
View File

@ -1,7 +1,9 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
if ENABLE_GTK_DOC
SUBDIRS = reference SUBDIRS = reference
endif
EXTRA_DIST += debugging.txt macros.txt EXTRA_DIST += debugging.txt macros.txt