Changeset 278381d in mod_gnutls for configure.ac


Ignore:
Timestamp:
Jan 9, 2020, 1:54:05 AM (11 months ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
asyncio, master, proxy-ticket
Children:
573b810
Parents:
482bafc
git-author:
Fiona Klute <fiona.klute@…> (01/08/20 17:48:04)
git-committer:
Fiona Klute <fiona.klute@…> (01/09/20 01:54:05)
Message:

Remove code for SoftHSM 1 support

SoftHSM 1 has been unsupported for years, so there's no point in
supporting tests with it.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r482bafc r278381d  
    224224MODULE_LIBS="${LIBGNUTLS_LIBS}"
    225225
    226 AC_PATH_PROGS([SOFTHSM], [softhsm2-util softhsm], [no])
    227 if test "${SOFTHSM}" != "no"; then
    228         softhsm_version=$(${SOFTHSM} --version)
    229         AS_VERSION_COMPARE([$(${SOFTHSM} --version)], [2.0.0],
    230                            [AC_SUBST(SOFTHSM_MAJOR_VERSION, [1])],
    231                            [AC_SUBST(SOFTHSM_MAJOR_VERSION, [2])],
    232                            [AC_SUBST(SOFTHSM_MAJOR_VERSION, [2])])
    233 fi
     226AC_PATH_PROGS([SOFTHSM], [softhsm2-util], [no])
    234227AM_CONDITIONAL([HAVE_SOFTHSM], [test "${SOFTHSM}" != "no"])
    235 AM_CONDITIONAL([HAVE_SOFTHSM1], [test "${SOFTHSM_MAJOR_VERSION}" = "1"])
    236 AM_CONDITIONAL([HAVE_SOFTHSM2], [test "${SOFTHSM_MAJOR_VERSION}" = "2"])
    237228
    238229AC_SUBST(MODULE_CFLAGS)
Note: See TracChangeset for help on using the changeset viewer.