X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=m4%2Fpsi.m4;h=eecfa6192a3a57ff1efdae2d7bf61e605781c513;hp=e9955f05483e7c5ea442c742e09c20445e291730;hb=0d05258e368d32f04371734a45759ea9ac2f5a7a;hpb=2421d323be79e4a811a4197914330a8c0124b130

diff --git a/m4/psi.m4 b/m4/psi.m4
index e9955f0..eecfa61 100644
--- a/m4/psi.m4
+++ b/m4/psi.m4
@@ -4,6 +4,7 @@ PSI_CONSTS=
 PSI_REDIRS=
 PSI_MACROS=
 PSI_DECLS=
+PSI_VA_DECLS=
 
 psi_includes() {
 	local have_
@@ -77,10 +78,10 @@ AC_DEFUN(PSI_CHECK_LIBJIT, [
 	fi
 ])
 
+PHP_ARG_WITH(psi-libffi, where to find libffi,
+[  --with-psi-libffi=DIR   PSI: path to libffi], [ ], [ ])
 AC_DEFUN(PSI_CHECK_LIBFFI, [
 	AC_REQUIRE([PSI_PKG_CONFIG])dnl
-	PHP_ARG_WITH(psi-libffi, where to find libffi,
-	[  --with-psi-libffi=DIR   PSI: path to libffi], [ ], [ ])
 
 	AC_CACHE_CHECK(for libffi through pkg-config, psi_cv_libffi, [
 	if $PKG_CONFIG --exists libffi
@@ -129,6 +130,10 @@ AC_DEFUN(PSI_CHECK_LIBFFI, [
 		], [
 		], -L$psi_cv_libffi_dir/$PHP_LIBDIR)
 	], -L$psi_cv_libffi_dir/$PHP_LIBDIR)
+	PHP_CHECK_LIBRARY(ffi, ffi_prep_cif_var, [
+		AC_DEFINE(PSI_HAVE_FFI_PREP_CIF_VAR, 1, [ ])
+	], [
+	], -L$psi_cv_libffi_dir/$PHP_LIBDIR)
 ])
 
 dnl PSI_COMPUTE_STR(variable, string or expression)