diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-06-14 20:10:28 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-06-14 20:10:28 +0000 |
| commit | 60143a8bf82857f3a4534642eb1cd9f65ca1e79d (patch) | |
| tree | c1dcb7f21e3e75ae842ba5a6e83b7a3a44f72c5b | |
| parent | 52930d8a275dd6628afdad3dfab8ca362de621a4 (diff) | |
| download | pango-60143a8bf82857f3a4534642eb1cd9f65ca1e79d.tar.gz | |
Force off gtk-doc in absence of Cairo. (#305652, Amit Aronovitch)
2005-06-14 Owen Taylor <otaylor@redhat.com>
* configure.in: Force off gtk-doc in absence of Cairo.
(#305652, Amit Aronovitch)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | configure.in | 7 |
3 files changed, 17 insertions, 0 deletions
@@ -1,5 +1,10 @@ 2005-06-14 Owen Taylor <otaylor@redhat.com> + * configure.in: Force off gtk-doc in absence of Cairo. + (#305652, Amit Aronovitch) + +2005-06-14 Owen Taylor <otaylor@redhat.com> + * pango/opentype/pango-ot-info.c (pango_ot_info_finalize) pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_finalize): Chain up from finalize. (#307547, Paolo Borelli) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 5295f32e..3b275d35 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,10 @@ 2005-06-14 Owen Taylor <otaylor@redhat.com> + * configure.in: Force off gtk-doc in absence of Cairo. + (#305652, Amit Aronovitch) + +2005-06-14 Owen Taylor <otaylor@redhat.com> + * pango/opentype/pango-ot-info.c (pango_ot_info_finalize) pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_finalize): Chain up from finalize. (#307547, Paolo Borelli) diff --git a/configure.in b/configure.in index d779ab86..dbba0b0c 100644 --- a/configure.in +++ b/configure.in @@ -462,6 +462,13 @@ dnl ************************** dnl *** Checks for gtk-doc *** dnl ************************** +if $have_cairo ; then : ; else + if test x$enable_gtk_doc = xyes ; then + AC_MSG_WARN([Cairo not present, disabling doc building]) + enable_gtk_doc=no + fi +fi + GTK_DOC_CHECK([1.0]) AC_ARG_ENABLE(man, |