PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(psi)
-PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)
+
+case "PHP_EXT_BUILDDIR(psi)" in
+""|.) PHP_PSI_BUILDDIR=$PHP_PSI_SRCDIR
+ ;;
+*) PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)
+ ;;
+esac
m4_foreach(incfile, [
[ax/ax_check_sign.m4],
[psi/psi_const.m4],
[psi/psi_decl.m4],
[psi/psi_macro.m4],
- [psi/psi_struct.m4],
+ [psi/psi_composite.m4],
+ [posix/arpa_inet.m4],
[posix/errno.m4],
[posix/fcntl.m4],
[posix/glob.m4],
[posix/stdio.m4],
[posix/stdint.m4],
[posix/stdlib.m4],
+ [posix/stdarg.m4],
[posix/sys_select.m4],
[posix/sys_socket.m4],
[posix/sys_stat.m4],
])
PHP_ARG_ENABLE(psi, whether to enable PHP System Interface support,
-[ --enable-psi Enable PHP System Interface support])
+[ --enable-psi Enable PSI (PHP System Interface) support])
if test "$PHP_PSI" != no; then
- PHP_CONFIGURE_PART(Configuring PSI)
-
PHP_ARG_ENABLE(psi-posix, whether to pre-define POSIX decls,
- [ --enable-psi-posix=... PSI: pre-define POSIX decls], [ ], [ ])
+ [ --enable-psi-posix=... PSI: pre-define POSIX decls], [all], [no])
+
+ PHP_ARG_ENABLE(psi-maintainer-mode, whether to enable maintainer mode,
+ [ --enable-psi-maintainer-mode
+ PSI: enable maintainer mode
+ . parallel configure
+ . make dependencies
+ . extra debug wrappers], [no], [no])
PHP_ARG_WITH(psi-libjit, where to find libjit,
[ --with-psi-libjit=DIR PSI: path to libjit], [ ], [ ])
#endif
], [
AC_MSG_RESULT([needs define])
- AC_DEFINE([_GNU_SOURCE], [], [ ])
+ AC_DEFINE([_GNU_SOURCE], [1], [ ])
], [
AC_MSG_RESULT([already defined])
])
- psi_save_LIBS=$LIBS
- LIBS=
-
- PSI_LEMON
+ AC_MSG_CHECKING([psi source dir])
+ AC_MSG_RESULT([$PHP_PSI_SRCDIR])
+ AC_MSG_CHECKING([psi build dir])
+ AC_MSG_RESULT([$PHP_PSI_BUILDDIR])
+
PSI_CHECK_LIBJIT
PSI_CHECK_LIBFFI
- AC_PATH_PROG(NM, nm)
AC_FUNC_FNMATCH
AC_FUNC_MMAP
PSI_CONFIG_INIT
+
+ dnl basics, one-by-one
PSI_CHECK_STD_TYPES
PSI_CHECK_STDINT
PSI_CHECK_SYS_TYPES
PSI_CHECK_STDDEF
- PSI_CHECK_ERRNO
- PSI_CHECK_FCNTL
- PSI_CHECK_GLOB
- PSI_CHECK_LOCALE
- PSI_CHECK_STDIO
- PSI_CHECK_STDLIB
- PSI_CHECK_UNISTD
- PSI_CHECK_TIME
- PSI_CHECK_SYS_SELECT
- PSI_CHECK_SYS_SOCKET
- PSI_CHECK_SYS_TIME
- PSI_CHECK_SYS_TIMES
- PSI_CHECK_SYS_STAT
- PSI_CHECK_SYS_UIO
- PSI_CHECK_SYS_UTSNAME
- PSI_CHECK_NDBM
- PSI_CHECK_NETDB
- PSI_CHECK_NETINET_IN
- PSI_CHECK_NETINET_TCP
- PSI_CHECK_POLL
- PSI_CHECK_SIGNAL
- PSI_CHECK_SYSLOG
- PSI_CHECK_WCHAR
- PSI_CHECK_WCTYPE
+
+ dnl parallel
+ AC_MSG_CHECKING([for POSIX modules])
+ if ! $PSI_FAST_CONFIG; then
+ AC_MSG_RESULT([$PHP_PSI_POSIX])
+ fi
+
+ PSI_CONFIG_POSIX(signal, signal.h, [
+ PSI_CONFIG_POSIX(time, time.h, [
+ PSI_CONFIG_POSIX(sys/stat, sys/stat.h)
+ PSI_CONFIG_POSIX(wchar, wchar.h, [
+ PSI_CONFIG_POSIX(wctype, wctype.h)
+ ])
+ ])
+ PSI_CONFIG_POSIX(sys/select, sys/select.h)
+ ])
+ PSI_CONFIG_POSIX(poll, poll.h)
+ PSI_CONFIG_POSIX(syslog, syslog.h)
+ PSI_CONFIG_POSIX(errno, errno.h)
+ PSI_CONFIG_POSIX(fcntl, fcntl.h)
+ PSI_CONFIG_POSIX(glob, glob.h)
+ PSI_CONFIG_POSIX(locale, locale.h xlocale.h)
+ PSI_CONFIG_POSIX(stdio, stdio.h)
+ PSI_CONFIG_POSIX(stdlib, stdlib.h)
+ PSI_CONFIG_POSIX(unistd, unistd.h)
+ PSI_CONFIG_POSIX(stdarg, stdarg.h)
+ PSI_CONFIG_POSIX(sys/socket, sys/socket.h, [
+ PSI_CONFIG_POSIX(netinet/in, netinet/in.h, [
+ PSI_CONFIG_POSIX(arpa/inet, arpa/inet.h)
+ ])
+ PSI_CONFIG_POSIX(netdb, netdb.h)
+ ])
+ PSI_CONFIG_POSIX(netinet/tcp, netinet/tcp.h)
+ PSI_CONFIG_POSIX(sys/time, sys/time.h)
+ PSI_CONFIG_POSIX(sys/times, sys/times.h)
+ PSI_CONFIG_POSIX(sys/uio, sys/uio.h)
+ PSI_CONFIG_POSIX(sys/utsname, sys/utsname.h)
+ PSI_CONFIG_POSIX(ndbm, dnl
+ ndbm.h dnl posix
+ relic.h dnl qdbm
+ gdbm-ndbm.h dnl gdbm
+ )
+
PSI_CONFIG_DONE
- psi_eval_LIBS=$LIBS
- LIBS=$psi_save_LIBS
- PHP_EVAL_LIBLINE($psi_eval_LIBS, PSI_SHARED_LIBADD)
PHP_SUBST(PSI_SHARED_LIBADD)
AC_DEFINE_UNQUOTED(PHP_PSI_SHLIB_SUFFIX, ["$SHLIB_SUFFIX_NAME"], DL suffix)
- AC_DEFINE_UNQUOTED([PSI_STDINC], ["$PSI_STDINC"], [Standard includes])
- AC_DEFINE_UNQUOTED([PSI_TYPES], ["$PSI_TYPES"], [Predefined types])
- AC_DEFINE_UNQUOTED([PSI_STRUCTS], ["$PSI_STRUCTS"], [Predefined structs])
- AC_DEFINE_UNQUOTED([PSI_UNIONS], ["$PSI_UNIONS"], [Predefined structs])
- AC_DEFINE_UNQUOTED([PSI_CONSTS], ["$PSI_CONSTS"], [Predefined constants])
- AC_DEFINE_UNQUOTED([PSI_MACROS], ["$PSI_MACROS"], [Redirected Macros])
- AC_DEFINE_UNQUOTED([PSI_REDIRS], ["$PSI_REDIRS"], [Redirected functions])
- 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/calc)
PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src/types)
+ PHP_ADD_INCLUDE($PHP_PSI_BUILDDIR)
PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src)
PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src/types)
- PHP_PSI_HEADERS=`(cd $PHP_PSI_SRCDIR/src && ls *.h types/*.h)`
+ PHP_PSI_HEADERS=" \
+ src/calc/basic.h src/calc/bin.h src/calc/bool.h src/calc/cast.h \
+ src/calc/cmp.h src/calc/oper.h \
+ `(cd $PHP_PSI_SRCDIR/src && ls *.h types/*.h)` \
+ "
# parser* should come first
PHP_PSI_SOURCES=" \
- src/parser_proc.c \
- src/parser.c \
- `(cd $PHP_PSI_SRCDIR && ls src/*.c src/types/*.c | $EGREP -v '^src/parser')` \
+ src/parser_proc.c src/parser.c \
+ `(cd $PHP_PSI_SRCDIR && ls src/*.c src/types/*.c \
+ | $EGREP -v '^src/parser' \
+ )` \
+ "
+ PHP_PSI_GENERATED=" \
+ src/parser_proc.c src/parser.c \
+ src/calc/basic.h src/calc/bin.h src/calc/bool.h src/calc/cast.h \
+ src/calc/cmp.h src/calc/oper.h \
"
PHP_NEW_EXTENSION(psi, $PHP_PSI_SOURCES, $ext_shared)
PHP_INSTALL_HEADERS(ext/psi, php_psi.h $PHP_PSI_HEADERS)
+ PHP_SUBST(PHP_PSI_GENERATED)
PHP_SUBST(PHP_PSI_HEADERS)
PHP_SUBST(PHP_PSI_SOURCES)
projects / m6w6 / ext-psi / blobdiff