X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=config.m4;h=e0890da903c012a73062bbc88cb7a826656ec254;hp=807670c4c4f955de2c8cbe9f307a25215e24a773;hb=19f0eb5807fb8d0f3aa305f2476f094e66a02709;hpb=7eb47ef2fc5655e7196e4e0fbf5104eed8274601

diff --git a/config.m4 b/config.m4
index 807670c..e0890da 100644
--- a/config.m4
+++ b/config.m4
@@ -1,91 +1,86 @@
-PHP_ARG_ENABLE(psi, whether to enable psi support,
+PHP_ARG_ENABLE(psi, whether to enable PHP System Interface support,
 [  --enable-psi            Enable PHP System Interface support])
-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 libjit,
-[  --with-psi-libffi=DIR   PSI: path to libffi])
-
-if test "$PHP_PSI" != "no"; then
-	AC_ARG_VAR(LEMON, The lemon parser generator of the SQLite project)
-	AC_PATH_PROG(LEMON, lemon, ./lemon)
-	PHP_SUBST(LEMON)
-
-	if test -z "$PKG_CONFIG"
-	then
-		AC_PATH_PROG(PKG_CONFIG, pkg-config, false)
-	fi
-
-	export PKG_CONFIG_PATH="$PHP_PSI_LIBFFI/lib/pkgconfig:$PHP_PSI_LIBJIT/lib/pkgconfig:$PKG_CONFIG_PATH"
-
-	AC_CACHE_CHECK(for libffi through pkg-config, PSI_cv_LIBFFI, [
-	if $PKG_CONFIG --exists libffi
-	then
-		PSI_cv_LIBFFI=true
-	else
-		PSI_cv_LIBFFI=false
-	fi])
-	if $PSI_cv_LIBFFI
-	then
-		PHP_EVAL_INCLINE(`$PKG_CONFIG --cflags libffi`)
-		PHP_EVAL_LIBLINE(`$PKG_CONFIG --libs libffi`, PSI_SHARED_LIBADD)
-	else
-		AC_CACHE_CHECK(for libffi, PSI_cv_LIBFFI_DIR, [
-		for PSI_cv_LIBFFI_DIR in $PHP_PSI_LIBFFI {/usr{,/local},/opt}{,/libffi}
-		do
-			if test -e $PSI_cv_LIBFFI_DIR/include/ffi/ffi.h
-			then
-				break
-			fi
-			PSI_cv_LIBFFI_DIR=
-		done])
-		if test -n "$PSI_cv_LIBFFI_DIR"
-		then
-			PHP_CHECK_LIBRARY(ffi, ffi_closure_alloc, [
-				AC_DEFINE(PSI_HAVE_FFI_CLOSURE_ALLOC, 1, [ ])
-			], [
-			], -L$PSI_cv_LIBFFI_DIR/$PHP_LIBDIR)
-			PHP_CHECK_LIBRARY(ffi, ffi_closure_free, [
-				AC_DEFINE(PSI_HAVE_FFI_CLOSURE_FREE, 1, [ ])
-			], [
-			], -L$PSI_cv_LIBFFI_DIR/$PHP_LIBDIR)
-			PHP_CHECK_LIBRARY(ffi, ffi_prep_closure, [
-				AC_DEFINE(PSI_HAVE_FFI_PREP_CLOSURE, 1, [ ])
-			], [
-			], -L$PSI_cv_LIBFFI_DIR/$PHP_LIBDIR)
-			PHP_ADD_INCLUDE($PSI_cv_LIBFFI_DIR/include/ffi)
-			PHP_ADD_LIBRARY_WITH_PATH(ffi, $PSI_cv_LIBFFI_DIR/$PHP_LIBDIR, PSI_SHARED_LIBADD)
-		else
-			AC_MSG_WARN([Could not find libffi, please provide the base install path])
-		fi
-	fi
-
-	AC_CACHE_CHECK(for libjit, PSI_cv_LIBJIT_DIR, [
-	for PSI_cv_LIBJIT_DIR in $PHP_PSI_LIBJIT {/usr{,/local},/opt}{,/libjit}
-	do
-		if test -e $PSI_cv_LIBJIT_DIR/include/jit/jit.h
-		then
-			break
-		fi
-		PSI_cv_LIBJIT_DIR=
-	done])
-	if test -n "$PSI_cv_LIBJIT_DIR"
-	then
-		PHP_ADD_INCLUDE($PSI_cv_LIBJIT_DIR/include)
-		PHP_ADD_LIBRARY_WITH_PATH(jit, $PSI_cv_LIBJIT_DIR/$PHP_LIBDIR, PSI_SHARED_LIBADD)
-	else
-		AC_MSG_WARN([Could not find libjit, please provide the base install path])
-	fi
 
-	PHP_SUBST(PSI_SHARED_LIBADD)
+if test "$PHP_PSI" != no; then
+	PHP_CONFIGURE_PART(Configuring PSI)
 
 	PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(psi)
 	PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)
 
+	m4_foreach(incfile, [
+		[ax_check_sign.m4],
+		[psi.m4],
+		[psi_type.m4],
+		[psi_const.m4],
+		[psi_decl.m4],
+		[psi_macro.m4],
+		[psi_struct.m4],
+		[errno.m4],
+		[glob.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],
+		[syslog.m4],
+		[time.m4],
+		[wchar.m4]], [
+		dnl pecl build
+		sinclude([m4/]incfile)
+		dnl php-src build
+		sinclude([ext/psi/m4/]incfile)
+	])
+	PSI_LEMON
+	PSI_CHECK_LIBJIT
+	PSI_CHECK_LIBFFI
+
+	AC_FUNC_FNMATCH
+	AC_HEADER_DIRENT
+
+	PSI_CHECK_STD_TYPES
+	PSI_CHECK_STDINT
+	PSI_CHECK_STDDEF
+	PSI_CHECK_SYS_TYPES
+	PSI_CHECK_ERRNO
+	PSI_CHECK_GLOB
+	PSI_CHECK_STDIO
+	PSI_CHECK_STDLIB
+	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_SYSLOG
+	PSI_CHECK_WCHAR
+
+	PHP_SUBST(PSI_SHARED_LIBADD)
+
+	AC_DEFINE_UNQUOTED(PHP_PSI_SHLIB_SUFFIX, ["$SHLIB_SUFFIX_NAME"], DL suffix)
+
+	AC_DEFINE_UNQUOTED([PSI_TYPES], [$PSI_TYPES], [Predefined types])
+	AC_DEFINE_UNQUOTED([PSI_STRUCTS], [$PSI_STRUCTS], [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/src)
 	PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src)
 
 	PHP_PSI_HEADERS=`(cd $PHP_PSI_SRCDIR/src && echo *.h)`
-	PHP_PSI_SOURCES="src/parser_proc.c src/parser.c src/validator.c src/module.c src/context.c"
+	PHP_PSI_SOURCES="src/parser_proc.c src/parser.c src/module.c src/context.c"
 	PHP_PSI_SOURCES="$PHP_PSI_SOURCES src/libjit.c src/libffi.c"
 
 	PHP_NEW_EXTENSION(psi, $PHP_PSI_SOURCES, $ext_shared)
@@ -98,4 +93,6 @@ if test "$PHP_PSI" != "no"; then
 	PHP_SUBST(PHP_PSI_BUILDDIR)
 
 	PHP_ADD_MAKEFILE_FRAGMENT
+
+	AC_MSG_RESULT()
 fi