summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2012-08-17 15:32:35 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2012-08-17 15:50:38 +0100
commit77ce19615614c36a6ceaaadbaecb6b0ea3f3c1f6 (patch)
tree34c5e0ca9761b2b95866c012e48b947c17dbbf04
parent31f6181defb49d3ebf489376d3da45e30ea98333 (diff)
downloadnettle-baserock/disable-documentation.tar.gz
Make documentation optional, to avoid requiring TeXbaserock/disable-documentation
-rw-r--r--Makefile.in2
-rw-r--r--configure.ac12
2 files changed, 13 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index be0de3cd..a8aa6a12 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,7 +35,7 @@ TARGETS = aesdata$(EXEEXT) desdata$(EXEEXT) twofishdata$(EXEEXT) \
$(LIBTARGETS) @IF_SHARED@ $(SHLIBTARGETS)
IMPLICIT_TARGETS = @IF_DLL@ $(LIBNETTLE_FILE) $(LIBHOGWEED_FILE)
-DOCTARGETS = nettle.info nettle.html nettle.pdf
+DOCTARGETS = @IF_DOCUMENTATION@ nettle.info nettle.html nettle.pdf
PKGCONFIG_FILES = nettle.pc @IF_HOGWEED@ hogweed.pc
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index 41526764..bb2dd324 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,10 @@ AC_ARG_ENABLE(gcov,
AC_HELP_STRING([--enable-gcov], [Instrument for gcov (requires a modern gcc)]),,
[enable_gcov=no])
+AC_ARG_ENABLE(documentation,
+ AC_HELP_STRING([--disable-documentation], [Do not generate documentation]),,
+ [enable_documentation=yes])
+
LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \
`echo $exec_prefix | sed "s@^NONE@$prefix/lib@g" | sed "s@^NONE@$ac_default_prefix/lib@g"` \
/usr/local/lib /sw/local/lib /sw/lib \
@@ -572,8 +576,15 @@ else
IF_SHARED='#'
fi
+if test "x$enable_documentation" = xyes ; then
+ IF_DOCUMENTATION=''
+else
+ IF_DOCUMENTATION='#'
+fi
+
AC_SUBST(IF_HOGWEED)
AC_SUBST(IF_SHARED)
+AC_SUBST(IF_DOCUMENTATION)
AC_SUBST(IF_DLL)
OPENSSL_LIBFLAGS=''
@@ -656,4 +667,5 @@ AC_MSG_NOTICE([summary of build options:
Compiler: ${CC}
Shared libraries: ${enable_shared}
Public key crypto: ${enable_public_key}
+ Documentation: ${enable_documentation}
])