diff options
| author | Alon Bar-Lev <alon.barlev@gmail.com> | 2015-12-18 12:14:08 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-12-18 16:10:35 +0100 |
| commit | af385d1552c0d5854db6db03c82e1e9b89e80b94 (patch) | |
| tree | a75d4838f9df6fccb1f4223cd36a2c67d5c9cb0d | |
| parent | 15127ff7aa674b25827c4017a4584261613d4cc9 (diff) | |
| download | gnutls-af385d1552c0d5854db6db03c82e1e9b89e80b94.tar.gz | |
build: allow installing man(1) even with --disable-doc
Currently these man pages are installed only if --enable-doc
is provided, while these are not actually docs, do not require any
special dependency, nor consume large space.
This adds --enable-manpages to enable/disable manpages installation, and
install the man(1) regardless of --disable-doc.
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| -rw-r--r-- | doc/manpages/Makefile.am | 2 |
5 files changed, 22 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 2c84b0e148..b50a6fe546 100644 --- a/.gitignore +++ b/.gitignore @@ -135,6 +135,7 @@ doc/manpages/ocsptool.1 doc/manpages/p11tool.1 doc/manpages/psktool.1 doc/manpages/srptool.1 +doc/manpages/tpmtool.1 doc/ocsp-api.texi doc/pgp-api.texi doc/pkcs11-api.texi diff --git a/Makefile.am b/Makefile.am index d61fded8e2..f39916fca5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,6 +42,10 @@ if HAVE_GUILE SUBDIRS += guile endif +if ENABLE_MANPAGES +SUBDIRS += doc/manpages +endif + if ENABLE_DOC SUBDIRS += doc endif diff --git a/configure.ac b/configure.ac index efacc30092..23d7cd5ad2 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,19 @@ AC_ARG_ENABLE(doc, enable_doc=$enableval, enable_doc=yes) AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no") +AC_ARG_ENABLE(manpages, + AS_HELP_STRING([--enable-manpages], [install manpages even if disable-doc is given]), + enable_manpages=$enableval,enable_manpages=auto) +AM_CONDITIONAL(ENABLE_MANPAGES, test "$enable_manpages" != "no") + +if test "${enable_manpages}" = "auto";then + if test "$enable_doc" != "no";then + enable_manpages=yes + else + enable_manpages=no + fi +fi + AC_ARG_ENABLE(tools, AS_HELP_STRING([--disable-tools], [don't compile any tools]), enable_tools=$enableval, enable_tools=yes) @@ -935,6 +948,7 @@ AC_MSG_NOTICE([summary of build options: Local libopts: ${included_libopts} Local libtasn1: ${included_libtasn1} Use nettle-mini: ${mini_nettle} + Documentation: ${enable_doc} (manpages: ${enable_manpages}) ]) AC_MSG_NOTICE([External hardware support: diff --git a/doc/Makefile.am b/doc/Makefile.am index da2aecc9b3..d81d22013f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -24,7 +24,7 @@ EXTRA_DIST = TODO certtool.cfg gnutls.pdf gnutls.html \ gnutls-guile.pdf gnutls-guile.html stamp_enums stamp_functions \ doc.mk -SUBDIRS = examples cyclo scripts manpages credentials latex +SUBDIRS = examples cyclo scripts credentials latex if ENABLE_GTK_DOC SUBDIRS += reference endif diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am index db1f71bab1..3299269adb 100644 --- a/doc/manpages/Makefile.am +++ b/doc/manpages/Makefile.am @@ -1116,7 +1116,9 @@ APIMANS += gnutls_x509_trust_list_verify_crt.3 APIMANS += gnutls_x509_trust_list_verify_crt2.3 APIMANS += gnutls_x509_trust_list_verify_named_crt.3 +if ENABLE_DOC dist_man_MANS += $(APIMANS) +endif $(APIMANS): stamp_mans |