diff options
| author | Akira TAGOH <akira@tagoh.org> | 2015-06-26 17:48:57 +0900 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2015-06-26 17:52:08 +0900 |
| commit | f80adc37ccf547d6ab02ac9ddbb345df7a846785 (patch) | |
| tree | f9819446504d28e01bc15586ec0192afb1b981c4 | |
| parent | 53ffa47ec5cd5e539945563ddea112db676e3c71 (diff) | |
Update gtk-doc to be modernized
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | docs/Makefile.am | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index cd0c25d..363c7a5 100644 --- a/configure.ac +++ b/configure.ac @@ -383,7 +383,11 @@ if test "x$enable_introspection" != "xyes"; then has_gobject=no fi AM_CONDITIONAL(ENABLE_GOBJECT, test x$has_gobject != xno) -GTK_DOC_CHECK(1.0) +m4_ifdef([GTK_DOC_CHECK], [ +GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) +],[ +AM_CONDITIONAL([ENABLE_GTK_DOC], false) +]) dnl ====================================================================== dnl output diff --git a/docs/Makefile.am b/docs/Makefile.am index a9a9523..ae9a97c 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -37,10 +37,6 @@ SCAN_OPTIONS= # e.g. MKDB_OPTIONS=--xml-mode --output-format=xml MKDB_OPTIONS=--xml-mode --output-format=xml -# Extra options to supply to gtkdoc-mktmpl -# e.g. MKTMPL_OPTIONS=--only-section-tmpl -MKTMPL_OPTIONS= - # Extra options to supply to gtkdoc-mkhtml MKHTML_OPTIONS= @@ -125,7 +121,7 @@ EXTRA_DIST += \ # Comment this out if you want 'make check' to test you doc status # and run some sanity checks if ENABLE_GTK_DOC -TESTS_ENVIRONMENT = cd $(srcdir) && \ +TESTS_ENVIRONMENT = \ DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \ SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) #TESTS = $(GTKDOC_CHECK) |