Changeset 19e80a5 in mod_gnutls for configure.ac


Ignore:
Timestamp:
Jan 28, 2019, 2:50:38 PM (13 months ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
debian/master
Children:
102aa67
Parents:
0931b35 (diff), ea9c699 (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:

Update upstream source from tag 'upstream/0.9.0'

Update to upstream version '0.9.0'
with Debian dir 619b546038886b240d2c8e61ee1a1b13ce0867d7

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r0931b35 r19e80a5  
    1 AC_INIT(mod_gnutls, 0.8.4)
     1AC_INIT(mod_gnutls, 0.9.0)
    22OOO_CONFIG_NICE(config.nice)
    33MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
     
    3030    AC_MSG_ERROR([*** Apache version $AP_VERSION not found!])
    3131)
     32
     33dnl Maybe use the binaries for tests, too?
     34AC_ARG_WITH([gnutls-dev],
     35        AS_HELP_STRING([--with-gnutls-dev=DIR],
     36                [Use GnuTLS libraries from a development (git) tree. Use \
     37                this if you want to test mod_gnutls with the latest \
     38                GnuTLS code.]),
     39        [
     40                AS_IF([test -d "${with_gnutls_dev}" ],
     41                [
     42                        LIBGNUTLS_CFLAGS="-I${with_gnutls_dev}/lib/includes"
     43                        LIBGNUTLS_LIBS="-lgnutls -L${with_gnutls_dev}/lib/.libs -R${with_gnutls_dev}/lib/.libs"
     44                ],
     45                [AC_MSG_ERROR([--with-gnutls-dev=DIR requires a directory!])])
     46        ], [])
    3247
    3348PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.3.0])
     
    5267AC_SEARCH_LIBS([gnutls_srp_server_get_username], [gnutls], [], [use_srp="no"])
    5368
    54 SRP_CFLAGS=""
     69GNUTLS_FEAT_CFLAGS=""
    5570if test "$use_srp" != "no"; then
    56         SRP_CFLAGS="-DENABLE_SRP=1"
    57 fi
     71        GNUTLS_FEAT_CFLAGS="-DENABLE_SRP=1"
     72fi
     73
     74# check if the available GnuTLS library supports raw extension parsing
     75AC_SEARCH_LIBS([gnutls_ext_raw_parse], [gnutls], [early_sni="yes"],
     76        [early_sni="no"])
     77if test "$early_sni" != "no"; then
     78        ENABLE_EARLY_SNI=1
     79        # This is for the test server configuration
     80        EXPECT_EARLY_SNI="Define EXPECT_EARLY_SNI"
     81else
     82        ENABLE_EARLY_SNI=0
     83        EXPECT_EARLY_SNI=""
     84fi
     85AC_SUBST(ENABLE_EARLY_SNI)
     86AC_SUBST(EXPECT_EARLY_SNI)
     87AM_SUBST_NOTMAKE(EXPECT_EARLY_SNI)
    5888
    5989AC_ARG_ENABLE(strict,
     
    127157dnl Enable test namespaces? Default is "yes".
    128158AC_ARG_ENABLE(test-namespaces,
    129         AS_HELP_STRING([--disable-test-namespaces], [Disable use of network \
    130         namespaces to run tests in parallel (some architectures might not \
    131         support it)]),
     159        AS_HELP_STRING([--disable-test-namespaces], [Disable use of \
     160        namespaces for tests (limits parallelization)]),
    132161        [use_netns=$enableval], [use_netns=yes])
    133162
    134 # Check if "unshare" is available and has permission to create network
    135 # and user namespaces
     163# Check if "unshare" is available and has permission to create
     164# network, IPC, and user namespaces
    136165AC_PATH_PROG([UNSHARE], [unshare], [no])
    137166AS_IF([test "${UNSHARE}" != "no"],
    138167      [
    139         AC_MSG_CHECKING([for permission to create network and user namespaces])
    140         AS_IF([${UNSHARE} --net -r /bin/sh -c \
     168        AC_MSG_CHECKING([for permission to use namespaces])
     169        AS_IF([${UNSHARE} --net --ipc -r /bin/sh -c \
    141170                "ip link set up lo && ip addr show" >&AS_MESSAGE_LOG_FD 2>&1],
    142171              [unshare_works="yes"], [unshare_works="no"])
     
    177206AC_MSG_RESULT($use_msva)
    178207
    179 have_apr_memcache=0
    180 CHECK_APR_MEMCACHE([have_apr_memcache=1], [have_apr_memcache=0])
    181 AC_SUBST(have_apr_memcache)
    182 
    183208# Building documentation requires pandoc, which in turn needs pdflatex
    184209# to build PDF output.
     
    188213        AC_PATH_PROG([PDFLATEX], [pdflatex], [no])
    189214        if test "$PDFLATEX" != "no"; then
    190                 build_doc=yes
     215                build_doc="html, manual page, pdf"
    191216        else
    192                 build_doc="html only"
     217                build_doc="html, manual page"
    193218        fi
    194219else
     
    213238AC_PATH_PROGS([HTTP_CLI], [curl wget], [no])
    214239
    215 MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${MSVA_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES} ${STRICT_CFLAGS}"
    216 MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"
     240MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${GNUTLS_FEAT_CFLAGS} ${MSVA_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES} ${STRICT_CFLAGS}"
     241MODULE_LIBS="${LIBGNUTLS_LIBS}"
    217242
    218243AC_PATH_PROGS([SOFTHSM], [softhsm2-util softhsm], [no])
     
    241266                      "[::1] 127.0.0.1". Note that IPv6 addresses must be \
    242267                      enclosed in square brackets.])
    243 AM_SUBST_NOTMAKE(TEST_IP)
    244268
    245269: ${TEST_LOCK_WAIT:="30"}
     
    285309DX_RTF_FEATURE(OFF)
    286310DX_XML_FEATURE(OFF)
    287 DX_PDF_FEATURE(ON)
     311DX_PDF_FEATURE(OFF)
    288312DX_PS_FEATURE(OFF)
    289313DX_INIT_DOXYGEN([mod_gnutls], [doc/doxygen.conf], [doc/api])
     
    292316                        doc/Makefile doc/doxygen.conf include/mod_gnutls.h \
    293317                        test/proxy_backend.conf test/ocsp_server.conf \
     318                        test/apache-conf/early_sni.conf \
    294319                        test/apache-conf/listen.conf \
    295320                        test/apache-conf/netns.conf])
     
    306331echo "   * SRP Authentication:  ${use_srp}"
    307332echo "   * MSVA Client Verification:    ${use_msva}"
     333echo "   * Early SNI:                   ${early_sni}"
    308334echo "   * Build documentation: ${build_doc}"
    309335echo ""
Note: See TracChangeset for help on using the changeset viewer.