diff options
| author | Stef Walter <stefw@gnome.org> | 2013-02-05 10:20:56 +0100 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2013-02-05 10:20:56 +0100 |
| commit | 23b18cb345afe061274ff73cd66fe8e6672fbcd4 (patch) | |
| tree | 4a76fddc548656434f3975808e0d4c0028041666 | |
| parent | 85751aa21dd9b93d8eb51e36767b5564ce6ce005 (diff) | |
Change the documentation configure arg to --enable-doc
* We're building more than just the gtk-doc reference
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 41 |
2 files changed, 24 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index 2e28212..7ab4468 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = \ ACLOCAL_AMFLAGS = -I build/m4 DISTCHECK_CONFIGURE_FLAGS = \ - --enable-gtk-doc \ + --enable-doc \ --disable-coverage dist-hook: diff --git a/configure.ac b/configure.ac index bad81e1..1c93729 100644 --- a/configure.ac +++ b/configure.ac @@ -136,37 +136,41 @@ HTML_DIR="$with_html_dir" AC_SUBST([HTML_DIR]) dnl enable/disable documentation building -AC_ARG_ENABLE([gtk-doc], - AS_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [[default=no]]]),, - [enable_gtk_doc=no]) +AC_ARG_ENABLE([doc], + AS_HELP_STRING([--enable-doc], + [build documentation using gtk-doc [[default=no]]]),, + [enable_doc=no]) -if test x$enable_gtk_doc = xyes; then +if test x$enable_doc = xyes; then if test -z "$GTKDOC_SCAN"; then - AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]) + AC_MSG_ERROR([gtk-doc not installed and --enable-doc requested]) fi + doc_status="yes (manual, gtk-doc reference)" +else + enable_doc=no + doc_status="no (no manual, reference)" fi -AC_MSG_CHECKING([whether to build gtk-doc documentation]) -AC_MSG_RESULT($enable_gtk_doc) +AC_MSG_CHECKING([whether to build documentation]) +AC_MSG_RESULT($enable_doc) dnl enable/disable output formats -AC_ARG_ENABLE([gtk-doc-html], - AS_HELP_STRING([--enable-gtk-doc-html], +AC_ARG_ENABLE([doc-html], + AS_HELP_STRING([--enable-doc-html], [build documentation in html format [[default=yes]]]),, - [enable_gtk_doc_html=yes]) -AC_ARG_ENABLE([gtk-doc-pdf], - AS_HELP_STRING([--enable-gtk-doc-pdf], + [enable_doc_html=yes]) +AC_ARG_ENABLE([doc-pdf], + AS_HELP_STRING([--enable-doc-pdf], [build documentation in pdf format [[default=no]]]),, - [enable_gtk_doc_pdf=no]) + [enable_doc_pdf=no]) if test -z "$GTKDOC_MKPDF"; then - enable_gtk_doc_pdf=no + enable_doc_pdf=no fi -AM_CONDITIONAL(ENABLE_GTK_DOC, [test x$enable_gtk_doc = xyes]) -AM_CONDITIONAL(GTK_DOC_BUILD_HTML, [test x$enable_gtk_doc_html = xyes]) -AM_CONDITIONAL(GTK_DOC_BUILD_PDF, [test x$enable_gtk_doc_pdf = xyes]) +AM_CONDITIONAL(ENABLE_GTK_DOC, [test x$enable_doc = xyes]) +AM_CONDITIONAL(GTK_DOC_BUILD_HTML, [test x$enable_doc_html = xyes]) +AM_CONDITIONAL(GTK_DOC_BUILD_PDF, [test x$enable_doc_pdf = xyes]) AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, [test -n "$LIBTOOL"]) AM_CONDITIONAL(GTK_DOC_USE_REBASE, [test -n "$GTKDOC_REBASE"]) @@ -303,6 +307,7 @@ AC_MSG_NOTICE([build options: Host: $host Debug build: $debug_status Strict build: $strict_status + Build documentation: $doc_status System global config: $p11_system_config_file System module config directory: $p11_system_config_modules Package module config directory: $p11_package_config_modules |