diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2007-04-27 06:45:46 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-04-27 06:45:46 +0000 |
| commit | c8ece6473d1472b1dbbe3e0b1fb04ffea7d31d40 (patch) | |
| tree | ae1624dffd6dc0d79799157376d6b563d7b84750 | |
| parent | 678cfffd62e8df12134ece4eb54efda0ed4052d5 (diff) | |
| download | pango-c8ece6473d1472b1dbbe3e0b1fb04ffea7d31d40.tar.gz | |
Add --disable-doc-cross-references.
2007-04-27 Behdad Esfahbod <behdad@gnome.org>
* configure.in: Add --disable-doc-cross-references.
* docs/Makefile.am: Make sure --disable-doc-cross-references is
set in order to make dist.
* Makefile.am: Add --disable-doc-cross-references to
DISTCHECK_CONFIGURE_FLAGS.
svn path=/trunk/; revision=2230
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 18 | ||||
| -rw-r--r-- | docs/Makefile.am | 18 |
4 files changed, 41 insertions, 7 deletions
@@ -1,3 +1,13 @@ +2007-04-27 Behdad Esfahbod <behdad@gnome.org> + + * configure.in: Add --disable-doc-cross-references. + + * docs/Makefile.am: Make sure --disable-doc-cross-references is + set in order to make dist. + + * Makefile.am: Add --disable-doc-cross-references to + DISTCHECK_CONFIGURE_FLAGS. + 2007-04-23 Behdad Esfahbod <behdad@gnome.org> * === Released 1.16.3 === diff --git a/Makefile.am b/Makefile.am index 86e9920a..cef144c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,4 +70,4 @@ if HAVE_WIN32 pkgconfig_DATA += pangowin32.pc endif -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-doc-cross-references diff --git a/configure.in b/configure.in index 00b3aa40..1f45c65a 100644 --- a/configure.in +++ b/configure.in @@ -599,11 +599,19 @@ fi AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno) -GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" -CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" - -AC_SUBST(GLIB_PREFIX) -AC_SUBST(CAIRO_PREFIX) +AC_ARG_ENABLE(doc-cross-references, + AC_HELP_STRING([--disable-doc-cross-references], + [cross reference glib and cairo symbols @<:@default=yes@:>@]), + enable_doc_cross_references=$enableval, + enable_doc_cross_references=yes) + +if test "x$enable_doc_cross_references" != xno ; then + GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" + CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" + AC_SUBST(GLIB_PREFIX) + AC_SUBST(CAIRO_PREFIX) +fi +AM_CONDITIONAL(ENABLE_DOC_CROSS_REFERENCES, test x$enable_doc_cross_references != xno) dnl ******************************************************** dnl * Options to pass to libtool diff --git a/docs/Makefile.am b/docs/Makefile.am index 0446d96f..2b3cc0a2 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -79,9 +79,11 @@ HTML_IMAGES = \ layout.gif \ rotated-text.png +if ENABLE_DOC_CROSS_REFERENCES # Extra options to supply to gtkdoc-fixref FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \ --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo +endif include $(top_srcdir)/gtk-doc.make @@ -104,7 +106,8 @@ EXTRA_DIST += \ BUILT_EXTRA_DIST = $(man_MANS) -dist-hook-local: +# force doc rebulid after configure +dist-hook-local: dist-local-check-no-cross-references maintainer-clean-local all-local files='$(BUILT_EXTRA_DIST)'; \ for f in $$files; do \ if test -f $$f; then d=.; else d=$(srcdir); fi; \ @@ -115,4 +118,17 @@ dist-hook-local: test -f $$f && cp -p $$f $(distdir)/TEXT; \ done +# +# Require gtk-doc when making dist +# +if ENABLE_DOC_CROSS_REFERENCES +dist-local-check-no-cross-references: + @echo "*** --disable-doc-cross-references must be used in order to make dist" + @false +else +dist-local-check-no-cross-references: +endif + +.PHONY: dist-local-check-no-cross-references + TESTS = check.docs |