Changeset e376ed8 in mod_gnutls for configure.ac


Ignore:
Timestamp:
Nov 29, 2019, 4:30:08 PM (12 months ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
master, proxy-ticket
Children:
618ee14
Parents:
d4c9331 (diff), 556783e (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 branch 'subca'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    rd4c9331 re376ed8  
    4646        ], [])
    4747
    48 PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.3.0])
     48PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.6.3])
    4949
    5050LIBGNUTLS_VERSION=`pkg-config --modversion gnutls`
     
    133133# openssl is needed as the responder for OCSP tests
    134134AC_PATH_PROG([OPENSSL], [openssl], [no])
    135 # OCSP checks with gnutls-cli from GnuTLS versions before 3.3.23,
    136 # 3.4.12, or 3.5.1 (on the respective 3.x branch) fail if intermediate
    137 # CAs cannot be status checked, even if there are no intermediate CAs
    138 # like in the mod_gnutls test suite where end entity certificates are
    139 # directly issued by a root CA.
    140 AC_MSG_CHECKING([for gnutls-cli version supporting OCSP for EE under root CA])
    141 AC_PREPROC_IFELSE(
    142         [AC_LANG_SOURCE([[#include "gnutls/gnutls.h"
    143                         #if GNUTLS_VERSION_NUMBER < 0x030317
    144                         #error
    145                         #elif GNUTLS_VERSION_NUMBER >= 0x030400 && GNUTLS_VERSION_NUMBER < 0x03040c
    146                         #error
    147                         #elif GNUTLS_VERSION_NUMBER == 0x030500
    148                         #error
    149                         #endif
    150                         ]])],
    151         [gnutls_ocsp_ok="yes"],
    152         [gnutls_ocsp_ok="no"],
    153 )
    154 AC_MSG_RESULT([$gnutls_ocsp_ok])
    155 AM_CONDITIONAL([ENABLE_OCSP_TEST], [test "${OPENSSL}" != "no" && test "${gnutls_ocsp_ok}" = "yes"])
     135AM_CONDITIONAL([ENABLE_OCSP_TEST], [test "${OPENSSL}" != "no"])
    156136
    157137dnl Enable test namespaces? Default is "yes".
Note: See TracChangeset for help on using the changeset viewer.