diff --git a/bootstrap.conf b/bootstrap.conf index 1c3cc61e6..32bae9387 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -50,7 +50,6 @@ bison 2.4 gettext 0.17 git 1.4.4 gperf - -gtkdocize - perl 5.5 wget - " diff --git a/configure.ac b/configure.ac index 5057536e5..731558a15 100644 --- a/configure.ac +++ b/configure.ac @@ -403,11 +403,6 @@ if test "$enable_fuzzer_target" != "no";then AC_DEFINE([FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION], 1, [Enable fuzzer target -not for production]) fi -dnl -dnl check for gtk-doc -dnl -GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) - AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.19]) m4_ifdef([AM_GNU_GET][TEXT_REQUIRE_VERSION],[ diff --git a/doc/Makefile.am b/doc/Makefile.am index fb1390d70..52f0ad9af 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -33,9 +33,6 @@ IMAGES = \ pkcs11-vision.png SUBDIRS = examples scripts credentials latex -if ENABLE_GTK_DOC -SUBDIRS += reference -endif -include $(top_srcdir)/doc/doc.mk diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index f10c8ed3c..b711b58ec 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -82,13 +82,4 @@ include $(top_srcdir)/gtk-doc.make # e.g. EXTRA_DIST += version.xml.in EXTRA_DIST += version.xml.in -# Comment this out if you want 'make check' to test you doc status -# and run some sanity checks -if ENABLE_GTK_DOC -TESTS_ENVIRONMENT = \ - DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \ - SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) -#TESTS = $(GTKDOC_CHECK) -endif - -include $(top_srcdir)/git.mk