-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
dnl PSI_CONFIG_INIT()
dnl Creates stubs of the headers with pre-defined types etc.
PHP_SUBST(PSI_DEPS)
PSI_CONFIG_TMP=$(mktemp -d)
+ PSI_FUNC_LIBC_MAIN
else
PSI_FAST_CONFIG=false
PSI_DEPS=false
fi
fi
- cat >$PHP_PSI_BUILDDIR/php_psi.dep <<EOF
-\$(PHP_PSI_SRCDIR)/php_psi.h:
-php_psi.h:
-\$(PHP_PSI_SRCDIR)/php_psi_stdinc.h:
-php_psi_stdinc.h:
-EOF
- 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 >>$PHP_PSI_BUILDDIR/php_psi.dep <<EOF
-$i:
-$(basename $i):
-EOF
- 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_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, [
-
- wait
-
if $PSI_FAST_CONFIG; then
+ wait
for conf_env in $PSI_CONFIG_TMP/*/conf.env; do
source $conf_env
done
LIBS=$psi_save_LIBS
PHP_EVAL_LIBLINE($psi_eval_LIBS, PSI_SHARED_LIBADD)
- cat >$PSI_STDINC <<EOF
-/* generated by configure */
-#ifndef PSI_STDINC_H
-#define PSI_STDINC_H
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#else
-# include "php_config.h"
-#endif
-
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
-#ifndef _REENTRANT
-# define _REENTRANT
-#endif
-
-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
+ [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)
AS_TR_SH([psi_config_posix_]$1)=true
;;
*)
- if expr "$PHP_PSI_POSIX" : '\b$1\b' >/dev/null; then
+ if expr "$PHP_PSI_POSIX" : '.*\b$1\b' >/dev/null; then
AS_TR_SH([psi_config_posix_]$1)=true
fi
;;
fi
])
-dnl PSI_CONFIG_POSIX(section, headers)
+dnl PSI_CONFIG_POSIX(section, headers, dependents)
AC_DEFUN(PSI_CONFIG_POSIX, [
PSI_CONFIG_POSIX_ENABLED($1, [
if $PSI_FAST_CONFIG; then
- PSI_CONFIG_POSIX_PARALLEL($1, $2)
+ PSI_CONFIG_POSIX_PARALLEL($1, $2, [$3])
else
ifelse([$2],,:,[AC_CHECK_HEADERS($2)])
AS_TR_CPP([PSI_CHECK_$1])
+ $3
fi
])
])
(
dnl setup
mkdir $PSI_CONFIG_TMP/AS_TR_SH([$1])
+ printenv > $PSI_CONFIG_TMP/AS_TR_SH([$1])/start.env
ln -s $(pwd)/confdefs.h $PSI_CONFIG_TMP/AS_TR_SH([$1])/confdefs.h
dnl restore stdio
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 libs
+ dnl save env
+ printenv > $PSI_CONFIG_TMP/AS_TR_SH([$1])/end.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
+
+ _AC_CACHE_DUMP >>$PSI_CONFIG_TMP/AS_TR_SH([$1])/conf.env
+
dnl done
printf "%s " "$1" >&66
+
+ $3
+ wait
) &
])
AC_ARG_VAR(LEMON, The lemon parser generator of the SQLite project)
if test -z "$LEMON"
then
- AC_PATH_PROG(LEMON, lemon, ./lemon)
+ AC_PATH_PROG(LEMON, lemon, $PHP_PSI_BUILDDIR/lemon)
fi
PHP_SUBST(LEMON)
])
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)
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)
projects / m6w6 / ext-psi / blobdiff