Changeset ae29683 in mod_gnutls for configure.ac


Ignore:
Timestamp:
Feb 21, 2014, 12:15:56 AM (6 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, upstream
Children:
4addf74, 62f781c
Parents:
180e49f (diff), 1a99240 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Imported Upstream version 0.6

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r180e49f rae29683  
    11dnl
    2 AC_INIT(mod_gnutls, 0.5.10)
     2AC_INIT(mod_gnutls, 0.6)
    33OOO_CONFIG_NICE(config.nice)
    44MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
     
    2020AC_PROG_LIBTOOL
    2121
     22AC_CONFIG_MACRO_DIR([m4])
     23
    2224AP_VERSION=2.0.40
    2325CHECK_APACHE(,$AP_VERSION,
     
    2628)
    2729
    28 dnl LIBTOOL="`${APR_CONFIG} --apr-libtool`"
    29 dnl AC_SUBST(LIBTOOL)
     30PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.12.6])
    3031
    31 dnl Depend on 2.10.0 due to safe renegotiation addition.
    32 MIN_TLS_VERSION=2.10.0
    33 AM_PATH_LIBGNUTLS($MIN_TLS_VERSION,,
    34         AC_MSG_ERROR([[
    35 *** 
    36 *** libgnutls was not found. You may want to get it from
    37 *** http://www.gnutls.org/
    38 ***
    39 ]]))
     32LIBGNUTLS_VERSION=`pkg-config --modversion gnutls`
    4033
    4134AC_ARG_ENABLE(srp,
     
    4841        SRP_CFLAGS="-DENABLE_SRP=1"
    4942fi
     43
    5044AC_MSG_CHECKING([whether to enable SRP functionality])
    5145AC_MSG_RESULT($use_srp)
    5246
    53 dnl CHECK_LUA()
     47AC_ARG_ENABLE(msva,
     48       AS_HELP_STRING([--enable-msva],
     49               [enable Monkeysphere client certificate verification]),
     50       use_msva=$enableval, use_msva=no)
     51
     52MSVA_CFLAGS=""
     53if test "$use_msva" != "no"; then
     54        AC_CHECK_HEADERS([msv/msv.h], [],
     55                         [AC_MSG_ERROR([*** No libmsv headers found!])])
     56        AC_SEARCH_LIBS([msv_query_agent], [msv], [],
     57                         [AC_MSG_ERROR([*** No libmsv found with msv_query_agent!])])
     58        MSVA_CFLAGS="-DENABLE_MSVA=1"
     59fi
     60
     61AC_MSG_CHECKING([whether to enable MSVA functionality])
     62AC_MSG_RESULT($use_msva)
    5463
    5564have_apr_memcache=0
     
    5766AC_SUBST(have_apr_memcache)
    5867
    59 MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
     68MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${MSVA_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
    6069MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"
    6170
     
    7382echo "   * GnuTLS Library version:      ${LIBGNUTLS_VERSION}"
    7483echo "   * SRP Authentication:          ${use_srp}"
     84echo "   * MSVA Client Verification:    ${use_msva}"
    7585echo ""
    7686echo "---"
Note: See TracChangeset for help on using the changeset viewer.