X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=config.m4;h=fa209641b1acb375ce910bdaac7153cc13df8541;hp=2c7af0b58cbe2d0fec1d7534000c0f0da53b6370;hb=9c6a90318dc5e20b73820d7c2bb8eb3b30888cb3;hpb=3a7e1819ee316d4b3076e9a1cfd9d68f66101021

diff --git a/config.m4 b/config.m4
index 2c7af0b..fa20964 100644
--- a/config.m4
+++ b/config.m4
@@ -59,7 +59,21 @@ if test "$PHP_PSI" != no; then
 	[  --with-psi-libffi=DIR   PSI: path to libffi], [ ], [ ])
 
 	AC_HEADER_ASSERT dnl # adds --disable-assert to define NDEBUG
-	
+
+	dnl we cannot use AC_USE_SYSTEM_EXTENSIONS here, because we're way too late
+	dnl in the game, and we're currently only targeting _GNU_SOURCE for now
+	AC_MSG_CHECKING([for _GNU_SOURCE])
+	AC_EGREP_CPP([gnu_source_not_defined], [
+		#ifndef _GNU_SOURCE
+		gnu_source_not_defined
+		#endif
+	], [
+		AC_MSG_RESULT([needs define])
+		AC_DEFINE([_GNU_SOURCE], [], [ ])
+	], [
+		AC_MSG_RESULT([already defined])
+	])
+
 	psi_save_LIBS=$LIBS
 	LIBS=
 
@@ -69,6 +83,7 @@ if test "$PHP_PSI" != no; then
 
 	AC_PATH_PROG(NM, nm)
 	AC_FUNC_FNMATCH
+	AC_FUNC_MMAP
 
 	PSI_CONFIG_INIT
 	PSI_CHECK_STD_TYPES
@@ -118,6 +133,7 @@ if test "$PHP_PSI" != no; then
 	AC_DEFINE_UNQUOTED([PSI_DECLS], ["$PSI_DECLS"], [Predefined functions])
 	AC_DEFINE_UNQUOTED([PSI_VA_DECLS], ["$PSI_VA_DECLS"], [Predefined vararg functions])
 
+	PHP_ADD_INCLUDE($PHP_PSI_SRCDIR)
 	PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src)
 	PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src/types)
 	PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src)