X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=config.m4;h=5c8ed57dc4f52ef4c184c52209282dee7c8b23b7;hp=0ff86b0f35073fcf7a04110b40a762a3cd09d950;hb=5eb675460ea7908245fc97f4a9622e6115d7d601;hpb=47ef16e0871aa7f4ea5462287f42eefdbf88268a diff --git a/config.m4 b/config.m4 index 0ff86b0..5c8ed57 100644 --- a/config.m4 +++ b/config.m4 @@ -1,42 +1,49 @@ 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_check_sign.m4], - [ax_pthread.m4], - [psi.m4], - [psi_type.m4], - [psi_const.m4], - [psi_decl.m4], - [psi_macro.m4], - [psi_struct.m4], - [errno.m4], - [fcntl.m4], - [glob.m4], - [locale.m4], - [stddef.m4], - [stdio.m4], - [stdint.m4], - [stdlib.m4], - [sys_select.m4], - [sys_socket.m4], - [sys_stat.m4], - [sys_time.m4], - [sys_times.m4], - [sys_types.m4], - [sys_uio.m4], - [sys_utsname.m4], - [ndbm.m4], - [netdb.m4], - [netinet_in.m4], - [netinet_tcp.m4], - [poll.m4], - [signal.m4], - [syslog.m4], - [time.m4], - [unistd.m4], - [wchar.m4], - [wctype.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]], [ dnl pecl build sinclude([m4/]incfile) dnl php-src build @@ -44,86 +51,138 @@ m4_foreach(incfile, [ ]) PHP_ARG_ENABLE(psi, whether to enable PHP System Interface support, -[ --enable-psi Enable PHP System Interface support]) - -PHP_ARG_ENABLE(psi-posix, whether to pre-define POSIX decls, -[ --enable-psi-posix=... PSI: pre-define POSIX decls], [ ], [ ]) - -PHP_ARG_WITH(psi-libjit, where to find libjit, -[ --with-psi-libjit=DIR PSI: path to libjit], [ ], [ ]) - -PHP_ARG_WITH(psi-libffi, where to find libffi, -[ --with-psi-libffi=DIR PSI: path to libffi], [ ], [ ]) +[ --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], [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], [ ], [ ]) + + PHP_ARG_WITH(psi-libffi, where to find libffi, + [ --with-psi-libffi=DIR PSI: path to libffi], [ ], [ ]) + + AC_HEADER_ASSERT dnl # adds --disable-assert to define NDEBUG + + 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]) - ifdef([AC_USE_SYSTEM_EXTENSIONS],AC_USE_SYSTEM_EXTENSIONS) - PSI_LEMON PSI_CHECK_LIBJIT PSI_CHECK_LIBFFI 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(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) - 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_PSI_HEADERS=`(cd $PHP_PSI_SRCDIR/src && echo *.h)` - PHP_PSI_SOURCES= # parser* should come first - PHP_PSI_SOURCES="$PHP_PSI_SOURCES src/parser_proc.c src/parser.c" - PHP_PSI_SOURCES="$PHP_PSI_SOURCES src/libjit.c src/libffi.c src/engine.c" - PHP_PSI_SOURCES="$PHP_PSI_SOURCES src/marshal.c src/calc.c src/module.c" - PHP_PSI_SOURCES="$PHP_PSI_SOURCES `(cd $PHP_PSI_SRCDIR && echo src/context*.c)`" + 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.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)