Changeset 6e1d45d in mod_gnutls

Timestamp:

May 12, 2015, 6:09:36 PM (8 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, main, master, proxy-ticket, upstream

Children:

28f3f4f

Parents:

47a3f49

git-author:

Thomas Klute <thomas2.klute@…> (05/12/15 18:06:10)

git-committer:

Thomas Klute <thomas2.klute@…> (05/12/15 18:09:36)

Message:

Build documentation through automake

The handwritten Makefile used before had no connection to the automake
system, so documentation could not be built automatically. The user had
to manually call make in doc/. With this change, documentation gets
built, installed, and included in the distribution archive as expected.

Building documentation requires pandoc, which in turn needs pdflatex to
build PDF output. Check for both tools during configuration and
enable/disable output files accordingly.

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• doc/Makefile (deleted)
• doc/Makefile.am (added)

Makefile.am

@@ -8 +8 @@
                 NOTICE LICENSE
 
-SUBDIRS = src test
+SUBDIRS = src test doc
 ACLOCAL_AMFLAGS = -I m4

configure.ac

@@ -77 +77 @@
 AC_SUBST(have_apr_memcache)
 
+# Building documentation requires pandoc, which in turn needs pdflatex
+# to build PDF output.
+AC_PATH_PROG([PANDOC], [pandoc], [no])
+if test "$PANDOC" != "no"; then
+        AC_PATH_PROG([PDFLATEX], [pdflatex], [no])
+fi
+AM_CONDITIONAL([USE_PANDOC], [test "$PANDOC" != "no"])
+AM_CONDITIONAL([USE_PDFLATEX], [test "$PANDOC" != "no" && \
+                               test "$PDFLATEX" != "no"])
+
 MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${MSVA_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES} ${STRICT_CFLAGS}"
 MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"
@@ -83 +93 @@
 AC_SUBST(MODULE_LIBS)
 
-AC_CONFIG_FILES([Makefile src/Makefile test/Makefile test/tests/Makefile include/mod_gnutls.h])
+AC_CONFIG_FILES([Makefile src/Makefile test/Makefile test/tests/Makefile \
+                          doc/Makefile include/mod_gnutls.h])
 AC_OUTPUT