X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=config.m4;h=75ea3f73052a5f4b9f32695e04179762693530d2;hp=63458ad690f39339cf5fc41b1a20cd6deb2d73cd;hb=4bf8ff5e477da2fa4f82518bb947055c2c0374d6;hpb=42f44eb5bf4ecd36e26e051fada79d861d0f92d2 diff --git a/config.m4 b/config.m4 index 63458ad..75ea3f7 100644 --- a/config.m4 +++ b/config.m4 @@ -1,49 +1,9 @@ -PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(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_compile_flag.m4], [ax/ax_check_sign.m4], [ax/ax_pthread.m4], [psi/psi.m4], - [psi/psi_type.m4], - [psi/psi_const.m4], - [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], - [posix/locale.m4], - [posix/stddef.m4], - [posix/stdio.m4], - [posix/stdint.m4], - [posix/stdlib.m4], - [posix/sys_select.m4], - [posix/sys_socket.m4], - [posix/sys_stat.m4], - [posix/sys_time.m4], - [posix/sys_times.m4], - [posix/sys_types.m4], - [posix/sys_uio.m4], - [posix/sys_utsname.m4], - [posix/ndbm.m4], - [posix/netdb.m4], - [posix/netinet_in.m4], - [posix/netinet_tcp.m4], - [posix/poll.m4], - [posix/signal.m4], - [posix/syslog.m4], - [posix/time.m4], - [posix/unistd.m4], - [posix/wchar.m4], - [posix/wctype.m4]], [ + [psi/psi_type.m4]], [ dnl pecl build sinclude([m4/]incfile) dnl php-src build @@ -54,15 +14,14 @@ PHP_ARG_ENABLE(psi, whether to enable PHP System Interface support, [ --enable-psi Enable PSI (PHP System Interface) support]) if test "$PHP_PSI" != no; then - PHP_ARG_ENABLE(psi-posix, whether to 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]) + . make dependencies], [no], [no]) + PHP_ARG_ENABLE(psi-threaded-parser, whether to enable threaded parser, + [ --enable-psi-threaded-parser + PSI: enable threads for startup parsing], [yes], [no]) PHP_ARG_WITH(psi-libjit, where to find libjit, [ --with-psi-libjit=DIR PSI: path to libjit], [ ], [ ]) @@ -72,122 +31,34 @@ if test "$PHP_PSI" != no; then AC_HEADER_ASSERT dnl # adds --disable-assert to define NDEBUG + PSI_CONFIG_INIT + + PSI_CHECK_MAINTAINER_MODE + PSI_CHECK_THREADED_PARSER + dnl we cannot use AC_USE_SYSTEM_EXTENSIONS here, because we're way too late dnl in the game, and we're currently only targeting _GNU_SOURCE for now - AC_MSG_CHECKING([for _GNU_SOURCE]) - AC_EGREP_CPP([gnu_source_not_defined], [ - #ifndef _GNU_SOURCE - gnu_source_not_defined - #endif - ], [ - AC_MSG_RESULT([needs define]) - AC_DEFINE([_GNU_SOURCE], [1], [ ]) - ], [ - 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_CHECK_GNU_SOURCE + PSI_CHECK_CPP + PSI_CHECK_STD_TYPES - PSI_CHECK_LIBJIT - PSI_CHECK_LIBFFI - + AC_HEADER_DIRENT AC_FUNC_FNMATCH AC_FUNC_MMAP + AC_CHECK_FUNCS([mknodat eaccess]) - PSI_CONFIG_INIT + PSI_CHECK_PTHREAD + PSI_CHECK_LIBJIT + PSI_CHECK_LIBFFI - dnl basics, one-by-one - PSI_CHECK_STD_TYPES - PSI_CHECK_STDINT - PSI_CHECK_SYS_TYPES - PSI_CHECK_STDDEF - - 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(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 - PHP_SUBST(PSI_SHARED_LIBADD) - AC_DEFINE_UNQUOTED(PHP_PSI_SHLIB_SUFFIX, ["$SHLIB_SUFFIX_NAME"], DL suffix) - 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=" \ - 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' \ - )` \ - " - 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_SUBST(PSI_SHARED_LIBADD) 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) - - PHP_SUBST(PHP_PSI_SRCDIR) - PHP_SUBST(PHP_PSI_BUILDDIR) - PHP_ADD_MAKEFILE_FRAGMENT AC_MSG_RESULT() fi