diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index cf886a9..aa3dfa1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.61) AC_INIT([p11-kit], - [0.18.3], + [0.19.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=p11-glue], [p11-kit], [http://p11-glue.freedesktop.org/p11-kit.html]) @@ -36,6 +36,7 @@ dnl Checks for programs. AC_PROG_CC AC_PROG_CPP AM_PROG_CC_C_O +PKG_PROG_PKG_CONFIG LINGUAS="" AM_GNU_GETTEXT([external], [need-ngettext]) @@ -156,6 +157,35 @@ AS_IF([test "$with_libtasn1" != "no"], [ AM_CONDITIONAL(WITH_ASN1, test "$with_libtasn1" = "yes") # -------------------------------------------------------------------- +# libffi + +AC_ARG_WITH([libffi], + AS_HELP_STRING([--without-libffi], + [Don't use libffi for building closures])) + +if test "$with_libffi" != "no"; then + PKG_CHECK_MODULES(LIBFFI, [libffi >= 3.0.0]) + AC_DEFINE_UNQUOTED(WITH_FFI, 1, [Use libffi for building closures]) + AC_SUBST(LIBFFI_CFLAGS) + AC_SUBST(LIBFFI_LIBS) + + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $LIBFFI_CFLAGS" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <ffi.h>], + [ #if FFI_CLOSURES + #else + #error no closures + #endif + ])], + [], [AC_MSG_ERROR([the libffi on this system has no support for closures.])]) + CFLAGS="$SAVE_CFLAGS" + + with_libffi="yes" +fi + +AM_CONDITIONAL(WITH_FFI, test "$with_libffi" = "yes") + +# -------------------------------------------------------------------- # Trust Module AC_ARG_ENABLE([trust-module], @@ -454,6 +484,7 @@ AC_MSG_NOTICE([build options: Load relative module paths from: $p11_module_path With libtasn1 dependency: $with_libtasn1 + With libffi: $with_libffi Build trust module: $enable_trust_module Trust module paths: $trust_status |