X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=m4%2Fpsi%2Fpsi.m4;h=b0e30f49eff63bbf66c687e0f4dfb8539c2736fd;hp=6b3668e1600bf47ba9b4d0c02d938b430cfa1864;hb=894e0ce93f9ce82109e904ae35c249bf6abe54f1;hpb=5ed7e51eb19a16f6f4e280abc33a2a4281b45166

diff --git a/m4/psi/psi.m4 b/m4/psi/psi.m4
index 6b3668e..b0e30f4 100644
--- a/m4/psi/psi.m4
+++ b/m4/psi/psi.m4
@@ -1,124 +1,68 @@
-dnl Generated headers with pre-defined types, structs, consts and decls.
-PSI_STDINC=$PHP_PSI_SRCDIR/php_psi_stdinc.h
-PSI_STDTYPES=$PHP_PSI_SRCDIR/php_psi_stdtypes.h
-PSI_TYPES=$PHP_PSI_SRCDIR/php_psi_types.h
-PSI_STRUCTS=$PHP_PSI_SRCDIR/php_psi_structs.h
-PSI_UNIONS=$PHP_PSI_SRCDIR/php_psi_unions.h
-PSI_CONSTS=$PHP_PSI_SRCDIR/php_psi_consts.h
-PSI_REDIRS=$PHP_PSI_SRCDIR/php_psi_redirs.h
-PSI_MACROS=$PHP_PSI_SRCDIR/php_psi_macros.h
-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, [
-	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 */
-#include "php_psi_stdinc.h"
-EOF
-	done
-	cat >>$PSI_STDTYPES <<EOF
-static struct psi_std_type {
-	token_t type_tag;
-	const char *type_name;
-	const char *alias;
-} psi_std_types@<:@@:>@ = {
-	{PSI_T_INT8, "int8_t", NULL},
-	{PSI_T_INT16, "int16_t", NULL},
-	{PSI_T_INT32, "int32_t", NULL},
-	{PSI_T_INT64, "int64_t", NULL},
-	{PSI_T_UINT8, "uint8_t", NULL},
-	{PSI_T_UINT16, "uint16_t", NULL},
-	{PSI_T_UINT32, "uint32_t", NULL},
-	{PSI_T_UINT64, "uint64_t", NULL},
-EOF
-	cat >>$PSI_TYPES <<EOF
-static struct psi_predef_type {
-	token_t type_tag;
-	const char *type_name;
-	const char *alias;
-} psi_predef_types@<:@@:>@ = {
-EOF
-	cat >>$PSI_STRUCTS <<EOF
-static struct psi_predef_struct {
-	token_t type_tag;
-	const char *type_name;
-	const char *var_name;
-	size_t offset;
-	size_t size;
-	size_t pointer_level;
-	size_t array_size;
-} psi_predef_structs@<:@@:>@ = {
-EOF
-	cat >>$PSI_UNIONS <<EOF
-static struct psi_predef_union {
-	token_t type_tag;
-	const char *type_name;
-	const char *var_name;
-	size_t offset;
-	size_t size;
-	size_t pointer_level;
-	size_t array_size;
-} psi_predef_unions@<:@@:>@ = {
-EOF
-	cat >>$PSI_CONSTS <<EOF
-static struct psi_predef_const {
-	token_t type_tag;
-	const char *type_name;
-	const char *var_name;
-	const char *val_text;
-	token_t val_type_tag;
-} psi_predef_consts@<:@@:>@ = {
-EOF
-	cat >>$PSI_REDIRS <<EOF
-typedef void (*psi_func_ptr)();
-static struct psi_func_redir {
-	const char *name;
-	psi_func_ptr func;
-} psi_func_redirs@<:@@:>@ = {
-EOF
-	cat >>$PSI_MACROS <<EOF
-EOF
-	cat >>$PSI_DECLS <<EOF
-static struct psi_predef_decl {
-	token_t type_tag;
-	const char *type_name;
-	const char *var_name;
-	size_t pointer_level;
-	size_t array_size;
-} psi_predef_decls@<:@@:>@ = {
-EOF
-	cat >>$PSI_VA_DECLS <<EOF
-static struct psi_predef_decl psi_predef_vararg_decls@<:@@:>@ = {
-EOF
-	cat >>$PSI_FN_DECLS <<EOF
-static struct psi_predef_decl psi_predef_functor_decls@<:@@:>@ = {
-EOF
+	psi_save_LIBS=$LIBS
+	LIBS=
+
+	if test "$PHP_PSI_MAINTAINER_MODE" = "yes"; then
+		PSI_FAST_CONFIG=true
+		PSI_DEPS=true
+		PSI_EXTRA_REDIRS=true
+		
+		PHP_SUBST(PSI_DEPS)
+		
+		PSI_CONFIG_TMP=$(mktemp -d)
+	else
+		PSI_FAST_CONFIG=false
+		PSI_DEPS=false
+		if test "$PHP_DEBUG" = "1"; then
+			PSI_EXTRA_REDIRS=true
+		else
+			PSI_EXTRA_REDIRS=false
+		fi
+	fi
+	
+	PSI_STDTYPES=
+	PSI_TYPES=
+	PSI_COMPOSITES=
+	PSI_CONSTS=
+	PSI_REDIRS=
+	PSI_MACROS=
+	PSI_DECLS=
+	
+	AC_CONFIG_FILES(
+		[$PHP_PSI_BUILDDIR/php_psi_stdinc.h:$PHP_PSI_SRCDIR/php_psi_stdinc.h.in]
+		[$PHP_PSI_BUILDDIR/php_psi_posix.h:$PHP_PSI_SRCDIR/php_psi_posix.h.in]
+	)
+
 ])
 
 dnl PSI_CONFIG_DONE()
 dnl Finish the headers with the pre-defined types etc.
 AC_DEFUN(PSI_CONFIG_DONE, [
-	cat >$PSI_STDINC <<EOF
-/* generated by configure */
-#ifndef _PSI_STDINC
-# define _PSI_STDINC
-PSI_INCLUDES
-#endif
-EOF
-	for i in $PSI_STDTYPES $PSI_TYPES $PSI_STRUCTS $PSI_UNIONS $PSI_CONSTS $PSI_REDIRS $PSI_DECLS $PSI_VA_DECLS $PSI_FN_DECLS; do
-		cat >>$i <<EOF
-	{0}
-};
-EOF
-	done
+	if $PSI_FAST_CONFIG; then
+		wait
+		for conf_env in $PSI_CONFIG_TMP/*/conf.env; do
+			source $conf_env
+		done
+	fi
+	
+	psi_eval_LIBS=$LIBS
+	LIBS=$psi_save_LIBS
+	PHP_EVAL_LIBLINE($psi_eval_LIBS, PSI_SHARED_LIBADD)
+	
+	[PSI_INCLUDES]="PSI_INCLUDES"
+	AC_SUBST([PSI_INCLUDES])
+	AC_SUBST([PSI_STDTYPES])
+	AC_SUBST([PSI_TYPES])
+	AC_SUBST([PSI_COMPOSITES])
+	AC_SUBST([PSI_CONSTS])
+	AC_SUBST([PSI_REDIRS])
+	AC_SUBST([PSI_MACROS])
+	AC_SUBST([PSI_DECLS])
 ])
 
 dnl PSI_SH_CONFIG_POSIX_ENABLED(section)
@@ -159,13 +103,60 @@ AC_DEFUN(PSI_SH_TEST_POSIX_ENABLED, [
 dnl PSI_CONFIG_POSIX(section, headers)
 AC_DEFUN(PSI_CONFIG_POSIX, [
 	PSI_CONFIG_POSIX_ENABLED($1, [
-		PHP_CONFIGURE_PART(Configuring PSI POSIX: $1)
-		ifelse([$2],,:,[AC_CHECK_HEADERS($2)])
-	], [
-		return 0
+		if $PSI_FAST_CONFIG; then
+			PSI_CONFIG_POSIX_PARALLEL($1, $2)
+		else
+			ifelse([$2],,:,[AC_CHECK_HEADERS($2)])
+			AS_TR_CPP([PSI_CHECK_$1])
+		fi 
 	])
 ])
 
+AC_DEFUN([PSI_CONFIG_POSIX_PARALLEL], [
+	(
+		dnl setup
+		mkdir $PSI_CONFIG_TMP/AS_TR_SH([$1])
+		ln -s $(pwd)/confdefs.h $PSI_CONFIG_TMP/AS_TR_SH([$1])/confdefs.h
+		
+		dnl restore stdio
+		exec 66>&AS_MESSAGE_FD
+		exec AS_MESSAGE_FD>$PSI_CONFIG_TMP/AS_TR_SH([$1])/stdout.log
+		exec 2>$PSI_CONFIG_TMP/AS_TR_SH([$1])/stderr.log
+		
+		dnl check for headers?
+		ifelse([$2],,:,[AC_CHECK_HEADERS($2)])
+		
+		dnl chaway
+		cd $PSI_CONFIG_TMP/AS_TR_SH([$1])
+		
+		dnl run checks
+		PSI_TYPES=
+		PSI_CONSTS=
+		PSI_COMPOSITES=
+		PSI_REDIRS=
+		PSI_MACROS=
+		PSI_DECLS=
+		AS_TR_CPP([PSI_CHECK_$1])
+		
+		dnl save env
+		cat >$PSI_CONFIG_TMP/AS_TR_SH([$1])/conf.env <<EOF
+LIBS="$LIBS \$LIBS"
+EOF
+		for env in TYPES CONSTS COMPOSITES MACROS REDIRS DECLS; do
+			eval var=\$PSI_$env
+			if test -n "$var"; then
+				cat >>$PSI_CONFIG_TMP/AS_TR_SH([$1])/conf.env <<EOF
+PSI_$env='$var'"
+\$PSI_$env"
+EOF
+			fi
+		done
+		
+		dnl done
+		printf "%s " "$1" >&66
+	) &
+])
+
 AC_DEFUN(PSI_PTHREAD_ONCE, [
 	AX_PTHREAD([
 		LIBS="$PTHREAD_LIBS $LIBS"
@@ -179,11 +170,30 @@ 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, [#define PSI_INCLUDES
-#define _GNU_SOURCE 1
-#define _POSIX_C_SOURCE 200809L
-#define _XOPEN_SOURCE 700
+AC_DEFUN(PSI_INCLUDES, [dnl
+#define PSI_INCLUDES
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+#ifndef _REENTRANT
+# define _REENTRANT
+#endif
 AC_INCLUDES_DEFAULT()
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#else
+# ifndef HAVE__BOOL
+#  ifdef __cplusplus
+typedef bool _Bool;
+#  else
+#   define _Bool signed char
+#  endif
+# endif
+# define bool _Bool
+# define false 0
+# define true 1
+# define __bool_true_false_are_defined 1
+#endif
 #ifdef HAVE_ERRNO_H
 # include <errno.h>
 #endif
@@ -208,7 +218,9 @@ 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>
@@ -261,7 +273,10 @@ dnl PSI_LEMON()
 dnl Declare $LEMON precious, and check for a `lemon` in $PATH.
 AC_DEFUN(PSI_LEMON, [
 	AC_ARG_VAR(LEMON, The lemon parser generator of the SQLite project)
-	AC_PATH_PROG(LEMON, lemon, ./lemon)
+	if test -z "$LEMON"
+	then
+		AC_PATH_PROG(LEMON, lemon, ./lemon)
+	fi
 	PHP_SUBST(LEMON)
 ])
 
@@ -299,7 +314,7 @@ AC_DEFUN([PSI_SH_TEST_ALIGNOF], [test -n "$AS_TR_SH([ac_cv_alignof_]$1)" && test
 
 dnl PSI_CHECK_SIZEOF(type, special-includes)
 dnl AC_CHECK_SIZEOF wrapper with PSI_INCLUDES
-dnl Defines psi\\SIZEOF_<TYPE> pre-defined constant in $PSI_CONSTS.
+dnl Defines psi\\SIZEOF_<TYPE> pre-defined constant in $PSI_CONSTS_H.
 AC_DEFUN(PSI_CHECK_SIZEOF, [
 	AC_CHECK_SIZEOF($1, [], PSI_INCLUDES
 		$2)
@@ -310,7 +325,7 @@ AC_DEFUN(PSI_CHECK_SIZEOF, [
 
 dnl PSI_CHECK_ALIGNOF(type, special-includes)
 dnl AC_CHECK_ALIGNOF wrapper with PSI_INCLUDES
-dnl Defines psi\\ALIGNOF_<TYPE> pre-defined constant in $PSI_CONSTS.
+dnl Defines psi\\ALIGNOF_<TYPE> pre-defined constant in $PSI_CONSTS_H.
 AC_DEFUN(PSI_CHECK_ALIGNOF, [
 	AC_CHECK_ALIGNOF($1, PSI_INCLUDES
 		$2)
@@ -404,6 +419,7 @@ AC_DEFUN(PSI_CHECK_LIBFFI, [
 		PHP_EVAL_INCLINE(`$PKG_CONFIG --cflags libffi`)
 		PHP_EVAL_LIBLINE(`$PKG_CONFIG --libs libffi`, PSI_SHARED_LIBADD)
 		AC_DEFINE(HAVE_LIBFFI, 1, Have libffi)
+		AC_DEFINE_UNQUOTED([PHP_PSI_LIBFFI_VERSION], ["`$PKG_CONFIG --modversion libffi`"], [libffi version])
 	else
 		AC_CACHE_CHECK(for libffi, psi_cv_libffi_dir, [
 		for psi_cv_libffi_dir in $PHP_PSI_LIBFFI {/usr{,/local},/opt}{,/libffi}