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


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    rc8294ad rfd82e59  
    11dnl
    2 AC_INIT(mod_gnutls, 0.7-beta)
     2AC_INIT(mod_gnutls, 0.6)
    33OOO_CONFIG_NICE(config.nice)
    44MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
     
    2828)
    2929
    30 PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.1.4])
     30PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.12.6])
    3131
    3232LIBGNUTLS_VERSION=`pkg-config --modversion gnutls`
     
    3737       use_srp=$enableval, use_srp=yes)
    3838
    39 # check if the available GnuTLS library supports SRP
    40 AC_SEARCH_LIBS([gnutls_srp_server_get_username], [gnutls], [], [use_srp="no"])
    41 
    4239SRP_CFLAGS=""
    4340if test "$use_srp" != "no"; then
    44         SRP_CFLAGS="-DENABLE_SRP=1"
     41        SRP_CFLAGS="-DENABLE_SRP=1"
    4542fi
    4643
     
    6259               [enable Monkeysphere client certificate verification]),
    6360       use_msva=$enableval, use_msva=no)
    64 AM_CONDITIONAL([USE_MSVA], [test "$use_msva" != "no"])
    6561
    6662MSVA_CFLAGS=""
    6763if test "$use_msva" != "no"; then
    68         AC_CHECK_HEADERS([msv/msv.h], [],
     64        AC_CHECK_HEADERS([msv/msv.h], [],
    6965                         [AC_MSG_ERROR([*** No libmsv headers found!])])
    7066        AC_SEARCH_LIBS([msv_query_agent], [msv], [],
    7167                         [AC_MSG_ERROR([*** No libmsv found with msv_query_agent!])])
    72         MSVA_CFLAGS="-DENABLE_MSVA=1"
     68        MSVA_CFLAGS="-DENABLE_MSVA=1"
    7369fi
    7470
     
    8076AC_SUBST(have_apr_memcache)
    8177
    82 # Building documentation requires pandoc, which in turn needs pdflatex
    83 # to build PDF output.
    84 build_doc=no
    85 AC_PATH_PROG([PANDOC], [pandoc], [no])
    86 if 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
    93 fi
    94 AM_CONDITIONAL([USE_PANDOC], [test "$PANDOC" != "no"])
    95 AM_CONDITIONAL([USE_PDFLATEX], [test "$PANDOC" != "no" && \
    96                                test "$PDFLATEX" != "no"])
    97 
    98 # Check for Apache binary
    99 AC_PATH_PROGS([APACHE2], [apache2 httpd], [no])
    100 if test "${APACHE2}" = "no"; then
    101         AC_MSG_WARN([Neither apache2 nor httpd found in \
    102                      PATH. Test suite will fail.])
    103 fi
    104 
    10578MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${MSVA_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES} ${STRICT_CFLAGS}"
    10679MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"
     
    10982AC_SUBST(MODULE_LIBS)
    11083
    111 AC_CONFIG_FILES([Makefile src/Makefile test/Makefile test/tests/Makefile \
    112                           doc/Makefile include/mod_gnutls.h])
     84AC_CONFIG_FILES([Makefile src/Makefile include/mod_gnutls.h])
    11385AC_OUTPUT
    11486
     
    11991echo "   * Apache Modules directory:    ${AP_LIBEXECDIR}"
    12092echo "   * GnuTLS Library version:      ${LIBGNUTLS_VERSION}"
    121 echo "   * SRP Authentication:  ${use_srp}"
    122 echo "   * MSVA Client Verification:    ${use_msva}"
    123 echo "   * Build documentation: ${build_doc}"
     93echo "   * SRP Authentication:          ${use_srp}"
     94echo "   * MSVA Client Verification:    ${use_msva}"
    12495echo ""
    12596echo "---"
Note: See TracChangeset for help on using the changeset viewer.