Changeset 74772b2 in mod_gnutls

Timestamp:

Feb 12, 2016, 8:24:35 PM (7 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, main, master, proxy-ticket, upstream

Children:

6f644fa

Parents:

5eb4544

Message:

Define autoconf/automake variables to handle different SoftHSM versions

Files:

• configure.ac (modified) (1 diff)
• test/Makefile.am (modified) (1 diff)

configure.ac

@@ -173 +173 @@
 
 AC_PATH_PROGS([SOFTHSM], [softhsm], [no])
+if test "${SOFTHSM}" != "no"; then
+        softhsm_version=$(${SOFTHSM} --version)
+        AS_VERSION_COMPARE([$(${SOFTHSM} --version)], [2.0.0],
+                           [AC_SUBST(SOFTHSM_MAJOR_VERSION, [1])],
+                           [AC_SUBST(SOFTHSM_MAJOR_VERSION, [2])],
+                           [AC_SUBST(SOFTHSM_MAJOR_VERSION, [2])])
+fi
 AM_CONDITIONAL([HAVE_SOFTHSM], [test "${SOFTHSM}" != "no"])
+AM_CONDITIONAL([HAVE_SOFTHSM1], [test "${SOFTHSM_MAJOR_VERSION}" = "1"])
+AM_CONDITIONAL([HAVE_SOFTHSM2], [test "${SOFTHSM_MAJOR_VERSION}" = "2"])
 
 AC_SUBST(MODULE_CFLAGS)

test/Makefile.am

@@ -170 +170 @@
 
 if HAVE_SOFTHSM
-AM_TESTS_ENVIRONMENT += export SOFTHSM="@SOFTHSM@";
+AM_TESTS_ENVIRONMENT += export SOFTHSM="@SOFTHSM@"; \
+        export SOFTHSM_MAJOR_VERSION="@SOFTHSM_MAJOR_VERSION@";
 endif