[psi/psi_decl.m4],
[psi/psi_macro.m4],
[psi/psi_composite.m4],
+ [posix/arpa_inet.m4],
[posix/errno.m4],
[posix/fcntl.m4],
[posix/glob.m4],
[ --enable-psi-maintainer-mode
PSI: enable maintainer mode
. parallel configure
- . source dependencies
- . extra decl wrappers], [no], [no])
+ . make dependencies
+ . extra debug wrappers], [no], [no])
PHP_ARG_WITH(psi-libjit, where to find libjit,
[ --with-psi-libjit=DIR PSI: path to libjit], [ ], [ ])
AC_MSG_RESULT([already defined])
])
+ 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_LEMON
PSI_CHECK_LIBJIT
PSI_CHECK_LIBFFI
- AC_PATH_PROG(NM, nm)
AC_FUNC_FNMATCH
AC_FUNC_MMAP
PSI_CHECK_STDDEF
dnl parallel
- AC_MSG_CHECKING([for POSIX modules: $PHP_PSI_POSIX])
+ 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(stdio, stdio.h)
PSI_CONFIG_POSIX(stdlib, stdlib.h)
PSI_CONFIG_POSIX(unistd, unistd.h)
- PSI_CONFIG_POSIX(time, time.h)
- PSI_CONFIG_POSIX(sys/select, sys/select.h)
- PSI_CONFIG_POSIX(sys/socket, sys/socket.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/stat, sys/stat.h)
PSI_CONFIG_POSIX(sys/uio, sys/uio.h)
PSI_CONFIG_POSIX(sys/utsname, sys/utsname.h)
PSI_CONFIG_POSIX(ndbm, dnl
relic.h dnl qdbm
gdbm-ndbm.h dnl gdbm
)
- PSI_CONFIG_POSIX(netdb, netdb.h)
- PSI_CONFIG_POSIX(netinet/in, netinet/in.h)
- PSI_CONFIG_POSIX(netinet/tcp, netinet/tcp.h)
- PSI_CONFIG_POSIX(poll, poll.h)
- PSI_CONFIG_POSIX(signal, signal.h)
- PSI_CONFIG_POSIX(syslog, syslog.h)
- PSI_CONFIG_POSIX(wchar, wchar.h)
- PSI_CONFIG_POSIX(wctype, wctype.h)
PSI_CONFIG_DONE
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.y 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)