Changeset 6e1d45d in mod_gnutls for configure.ac


Ignore:
Timestamp:
May 12, 2015, 6:09:36 PM (4 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, 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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r47a3f49 r6e1d45d  
    7777AC_SUBST(have_apr_memcache)
    7878
     79# Building documentation requires pandoc, which in turn needs pdflatex
     80# to build PDF output.
     81AC_PATH_PROG([PANDOC], [pandoc], [no])
     82if test "$PANDOC" != "no"; then
     83        AC_PATH_PROG([PDFLATEX], [pdflatex], [no])
     84fi
     85AM_CONDITIONAL([USE_PANDOC], [test "$PANDOC" != "no"])
     86AM_CONDITIONAL([USE_PDFLATEX], [test "$PANDOC" != "no" && \
     87                               test "$PDFLATEX" != "no"])
     88
    7989MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${MSVA_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES} ${STRICT_CFLAGS}"
    8090MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"
     
    8393AC_SUBST(MODULE_LIBS)
    8494
    85 AC_CONFIG_FILES([Makefile src/Makefile test/Makefile test/tests/Makefile include/mod_gnutls.h])
     95AC_CONFIG_FILES([Makefile src/Makefile test/Makefile test/tests/Makefile \
     96                          doc/Makefile include/mod_gnutls.h])
    8697AC_OUTPUT
    8798
Note: See TracChangeset for help on using the changeset viewer.