X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=m4%2Fpsi%2Fpsi.m4;h=9bb1a4bb57408f7b573420199c3d9fb4575bd705;hp=b137ec6484f23201d1ab4e7e5ea60013deb78ad2;hb=e82854b435ee087e5eb6af926866c9f2d810a5fe;hpb=21e56bfe786b2490cc02ba8b6b8275547171b048

diff --git a/m4/psi/psi.m4 b/m4/psi/psi.m4
index b137ec6..9bb1a4b 100644
--- a/m4/psi/psi.m4
+++ b/m4/psi/psi.m4
@@ -166,7 +166,7 @@ EOF
 		
 		_AC_CACHE_DUMP >>conf.env
 		dnl restore STDOUT,STDERR
-		exec >&$PSI_MESSAGE_FD 2>&$PSI_ERROR_FD
+		exec AS_MESSAGE_FD>&$PSI_MESSAGE_FD 2>&$PSI_ERROR_FD
 		
 		dnl done
 		AS_ECHO_N(["$1 "])
@@ -237,6 +237,9 @@ typedef bool _Bool;
 #ifdef HAVE_ARPA_NAMESER_H
 # include <arpa/nameser.h>
 #endif
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
 #endif
@@ -467,6 +470,13 @@ AC_DEFUN(PSI_CHECK_LIBFFI, [
 			AC_MSG_WARN([Could not find libffi, please provide the base install path])
 		fi
 	fi
+	
+	save_CFLAGS=$CFLAGS
+	CFLAGS="$CFLAGS $INCLUDES"
+	AC_CHECK_DECL(FFI_STDCALL,[AC_DEFINE([HAVE_FFI_STDCALL],[1],[ ])],,[#include "ffi.h"])
+	AC_CHECK_DECL(FFI_FASTCALL,[AC_DEFINE([HAVE_FFI_FASTCALL],[1],[ ])],,[#include "ffi.h"])
+	CFLAGS=$save_CFLAGS
+	
 	PHP_CHECK_LIBRARY(ffi, ffi_closure_alloc, [
 		PHP_CHECK_LIBRARY(ffi, ffi_prep_closure_loc, [
 			AC_DEFINE(PSI_HAVE_FFI_PREP_CLOSURE_LOC, 1, [ ])