X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fpsi%2Fpsi.m4;h=b0bbbf3056f3908fbfd07427b684192e4b5b1416;hb=fb1661f43586388050fd42b9702c7beefaae08f3;hp=2a1e681cc174e9c9d528b756b5a4dcf6264ee214;hpb=c9b3436bd51a4dcf7d6cc6817d4c7a8ad99538d4;p=m6w6%2Fext-psi

diff --git a/m4/psi/psi.m4 b/m4/psi/psi.m4
index 2a1e681..b0bbbf3 100644
--- a/m4/psi/psi.m4
+++ b/m4/psi/psi.m4
@@ -11,13 +11,11 @@ PSI_DECLS=$PHP_PSI_SRCDIR/php_psi_decls.h
 PSI_VA_DECLS=$PHP_PSI_SRCDIR/php_psi_va_decls.h
 PSI_FN_DECLS=$PHP_PSI_SRCDIR/php_psi_fn_decls.h
 
-PSI_CONFIG_APPEND=
-
 dnl PSI_CONFIG_INIT()
 dnl Creates stubs of the headers with pre-defined types etc.
 dnl These headers are included by src/context.c.
 dnl This macro must be called prior any checks for a type, struct, decl etc.
-AC_DEFUN(PSI_CONFIG_INIT, [
+AC_DEFUN(PSI_CONFIG_INIT, [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])dnl
 	for i in $PSI_STDTYPES $PSI_TYPES $PSI_STRUCTS $PSI_UNIONS $PSI_CONSTS $PSI_REDIRS $PSI_MACROS $PSI_DECLS $PSI_VA_DECLS $PSI_FN_DECLS; do
 		cat >$i <<EOF
 /* generated by configure */
@@ -110,12 +108,6 @@ AC_DEFUN(PSI_CONFIG_DONE, [
 /* generated by configure */
 #ifndef _PSI_STDINC
 # define _PSI_STDINC
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
-#ifndef _XOPEN_SOURCE
-# define _XOPEN_SOURCE
-#endif
 PSI_INCLUDES
 #endif
 EOF
@@ -137,7 +129,7 @@ AC_DEFUN(PSI_CONFIG_POSIX_ENABLED, [
 	AS_TR_SH([psi_config_posix_]$1)=false
 	case "$PHP_PSI_POSIX" in
 	yes|all)
-		AS_TR_SH([psi_config_posix_]$1)=true 
+		AS_TR_SH([psi_config_posix_]$1)=true
 		;;
 	*)
 		if expr "$PHP_PSI_POSIX" : '\b$1\b' >/dev/null; then
@@ -185,7 +177,14 @@ AC_DEFUN(PSI_PTHREAD, [
 dnl PSI_INCLUDES()
 dnl Expands to a complete list of include statements including
 dnl AC_INCLUDES_DEFAULT().
-AC_DEFUN(PSI_INCLUDES, [AC_INCLUDES_DEFAULT()
+AC_DEFUN(PSI_INCLUDES, [#define PSI_INCLUDES
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+#ifndef _REENTRANT
+# define _REENTRANT
+#endif
+AC_INCLUDES_DEFAULT()
 #ifdef HAVE_ERRNO_H
 # include <errno.h>
 #endif
@@ -210,8 +209,12 @@ AC_DEFUN(PSI_INCLUDES, [AC_INCLUDES_DEFAULT()
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
 #endif
-#ifdef HAVE_NDBM_H
+#ifdef HAVE_RELIC_H
+# include <relic.h>
+#elif HAVE_NDBM_H
 # include <ndbm.h>
+#elif HAVE_GDBM_NDBM_H
+# include <gdbm-ndbm.h>
 #endif
 #ifdef HAVE_NETDB_H
 # include <netdb.h>