Changeset 71e9a5c in mod_gnutls for configure.ac


Ignore:
Timestamp:
Aug 22, 2015, 3:53:31 PM (6 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports
Children:
b837187
Parents:
2db6923 (diff), 4addf74 (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:

Merge tag 'upstream/0.7' into debian

Upstream version 0.7

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r2db6923 r71e9a5c  
    11dnl
    2 AC_INIT(mod_gnutls, 0.6)
     2AC_INIT(mod_gnutls, 0.7)
    33OOO_CONFIG_NICE(config.nice)
    44MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
     
    1010AM_MAINTAINER_MODE
    1111AC_CANONICAL_TARGET
    12 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
     12AM_INIT_AUTOMAKE
    1313AM_CONFIG_HEADER(include/mod_gnutls_config.h:config.in)
    1414
     
    2222AC_CONFIG_MACRO_DIR([m4])
    2323
    24 AP_VERSION=2.0.40
     24AP_VERSION=2.2.0
    2525CHECK_APACHE(,$AP_VERSION,
    2626    :,:,
     
    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"
     45fi
     46
     47AC_ARG_ENABLE(strict,
     48       AS_HELP_STRING([--disable-strict],
     49               [Avoid strict compiler warnings and errors]),
     50       use_strict=$enableval, use_strict=yes)
     51
     52STRICT_CFLAGS=""
     53if test "$use_strict" != "no"; then
     54        STRICT_CFLAGS="-Wall -Werror -Wextra"
    4255fi
    4356
     
    4962               [enable Monkeysphere client certificate verification]),
    5063       use_msva=$enableval, use_msva=no)
     64AM_CONDITIONAL([USE_MSVA], [test "$use_msva" != "no"])
    5165
    5266MSVA_CFLAGS=""
    5367if test "$use_msva" != "no"; then
    54         AC_CHECK_HEADERS([msv/msv.h], [],
     68        AC_CHECK_HEADERS([msv/msv.h], [],
    5569                         [AC_MSG_ERROR([*** No libmsv headers found!])])
    5670        AC_SEARCH_LIBS([msv_query_agent], [msv], [],
    5771                         [AC_MSG_ERROR([*** No libmsv found with msv_query_agent!])])
    58         MSVA_CFLAGS="-DENABLE_MSVA=1"
     72        MSVA_CFLAGS="-DENABLE_MSVA=1"
    5973fi
    6074
     
    6680AC_SUBST(have_apr_memcache)
    6781
    68 MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${MSVA_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
     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
     105MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${MSVA_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES} ${STRICT_CFLAGS}"
    69106MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"
    70107
     
    72109AC_SUBST(MODULE_LIBS)
    73110
    74 AC_CONFIG_FILES([Makefile src/Makefile include/mod_gnutls.h])
     111# assign default values to TEST_HOST and TEST_IP if necessary
     112: ${TEST_HOST:="localhost"}
     113: ${TEST_IP:="[::1]"}
     114AC_ARG_VAR([TEST_HOST], [Host name to use for server instances started by \
     115                        "make check", must resolve to TEST_IP. The default \
     116                        is "localhost".])
     117AC_ARG_VAR([TEST_IP], [IP address to use for server instances started by \
     118                      "make check". The default is the IPv6 loopback address \
     119                      [::1].])
     120
     121AC_CONFIG_FILES([Makefile src/Makefile test/Makefile test/tests/Makefile \
     122                          doc/Makefile include/mod_gnutls.h])
    75123AC_OUTPUT
    76124
     
    81129echo "   * Apache Modules directory:    ${AP_LIBEXECDIR}"
    82130echo "   * GnuTLS Library version:      ${LIBGNUTLS_VERSION}"
    83 echo "   * SRP Authentication:          ${use_srp}"
    84 echo "   * MSVA Client Verification:    ${use_msva}"
     131echo "   * SRP Authentication:  ${use_srp}"
     132echo "   * MSVA Client Verification:    ${use_msva}"
     133echo "   * Build documentation: ${build_doc}"
    85134echo ""
    86135echo "---"
Note: See TracChangeset for help on using the changeset viewer.