Changes in configure.ac [fd82e59:c8294ad] in mod_gnutls


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    rfd82e59 rc8294ad  
    11dnl
    2 AC_INIT(mod_gnutls, 0.6)
     2AC_INIT(mod_gnutls, 0.7-beta)
    33OOO_CONFIG_NICE(config.nice)
    44MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
     
    2828)
    2929
    30 PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.12.6])
     30PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.1.4])
    3131
    3232LIBGNUTLS_VERSION=`pkg-config --modversion gnutls`
     
    3737       use_srp=$enableval, use_srp=yes)
    3838
     39# check if the available GnuTLS library supports SRP
     40AC_SEARCH_LIBS([gnutls_srp_server_get_username], [gnutls], [], [use_srp="no"])
     41
    3942SRP_CFLAGS=""
    4043if test "$use_srp" != "no"; then
    41         SRP_CFLAGS="-DENABLE_SRP=1"
     44        SRP_CFLAGS="-DENABLE_SRP=1"
    4245fi
    4346
     
    5962               [enable Monkeysphere client certificate verification]),
    6063       use_msva=$enableval, use_msva=no)
     64AM_CONDITIONAL([USE_MSVA], [test "$use_msva" != "no"])
    6165
    6266MSVA_CFLAGS=""
    6367if test "$use_msva" != "no"; then
    64         AC_CHECK_HEADERS([msv/msv.h], [],
     68        AC_CHECK_HEADERS([msv/msv.h], [],
    6569                         [AC_MSG_ERROR([*** No libmsv headers found!])])
    6670        AC_SEARCH_LIBS([msv_query_agent], [msv], [],
    6771                         [AC_MSG_ERROR([*** No libmsv found with msv_query_agent!])])
    68         MSVA_CFLAGS="-DENABLE_MSVA=1"
     72        MSVA_CFLAGS="-DENABLE_MSVA=1"
    6973fi
    7074
     
    7680AC_SUBST(have_apr_memcache)
    7781
     82# Building documentation requires pandoc, which in turn needs pdflatex
     83# to build PDF output.
     84build_doc=no
     85AC_PATH_PROG([PANDOC], [pandoc], [no])
     86if test "$PANDOC" != "no"; then
     87        AC_PATH_PROG([PDFLATEX], [pdflatex], [no])
     88        if test "$PDFLATEX" != "no"; then
     89                build_doc=yes
     90        else
     91                build_doc="html only"
     92        fi
     93fi
     94AM_CONDITIONAL([USE_PANDOC], [test "$PANDOC" != "no"])
     95AM_CONDITIONAL([USE_PDFLATEX], [test "$PANDOC" != "no" && \
     96                               test "$PDFLATEX" != "no"])
     97
     98# Check for Apache binary
     99AC_PATH_PROGS([APACHE2], [apache2 httpd], [no])
     100if test "${APACHE2}" = "no"; then
     101        AC_MSG_WARN([Neither apache2 nor httpd found in \
     102                     PATH. Test suite will fail.])
     103fi
     104
    78105MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${MSVA_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES} ${STRICT_CFLAGS}"
    79106MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"
     
    82109AC_SUBST(MODULE_LIBS)
    83110
    84 AC_CONFIG_FILES([Makefile src/Makefile include/mod_gnutls.h])
     111AC_CONFIG_FILES([Makefile src/Makefile test/Makefile test/tests/Makefile \
     112                          doc/Makefile include/mod_gnutls.h])
    85113AC_OUTPUT
    86114
     
    91119echo "   * Apache Modules directory:    ${AP_LIBEXECDIR}"
    92120echo "   * GnuTLS Library version:      ${LIBGNUTLS_VERSION}"
    93 echo "   * SRP Authentication:          ${use_srp}"
    94 echo "   * MSVA Client Verification:    ${use_msva}"
     121echo "   * SRP Authentication:  ${use_srp}"
     122echo "   * MSVA Client Verification:    ${use_msva}"
     123echo "   * Build documentation: ${build_doc}"
    95124echo ""
    96125echo "---"
Note: See TracChangeset for help on using the changeset viewer.