Changeset 74772b2 in mod_gnutls


Ignore:
Timestamp:
Feb 12, 2016, 8:24:35 PM (4 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, upstream
Children:
6f644fa
Parents:
5eb4544
Message:

Define autoconf/automake variables to handle different SoftHSM versions

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r5eb4544 r74772b2  
    173173
    174174AC_PATH_PROGS([SOFTHSM], [softhsm], [no])
     175if test "${SOFTHSM}" != "no"; then
     176        softhsm_version=$(${SOFTHSM} --version)
     177        AS_VERSION_COMPARE([$(${SOFTHSM} --version)], [2.0.0],
     178                           [AC_SUBST(SOFTHSM_MAJOR_VERSION, [1])],
     179                           [AC_SUBST(SOFTHSM_MAJOR_VERSION, [2])],
     180                           [AC_SUBST(SOFTHSM_MAJOR_VERSION, [2])])
     181fi
    175182AM_CONDITIONAL([HAVE_SOFTHSM], [test "${SOFTHSM}" != "no"])
     183AM_CONDITIONAL([HAVE_SOFTHSM1], [test "${SOFTHSM_MAJOR_VERSION}" = "1"])
     184AM_CONDITIONAL([HAVE_SOFTHSM2], [test "${SOFTHSM_MAJOR_VERSION}" = "2"])
    176185
    177186AC_SUBST(MODULE_CFLAGS)
  • test/Makefile.am

    r5eb4544 r74772b2  
    170170
    171171if HAVE_SOFTHSM
    172 AM_TESTS_ENVIRONMENT += export SOFTHSM="@SOFTHSM@";
     172AM_TESTS_ENVIRONMENT += export SOFTHSM="@SOFTHSM@"; \
     173        export SOFTHSM_MAJOR_VERSION="@SOFTHSM_MAJOR_VERSION@";
    173174endif
    174175
Note: See TracChangeset for help on using the changeset viewer.