X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=config.m4;h=641b16ab934c32e8a912c23838cb887ba210a07f;hp=bfa56e5d4121ab48c21480cf3cb818da40821872;hb=b1720af16e5d7765e2effcd16e23f351c2f82e54;hpb=0d05258e368d32f04371734a45759ea9ac2f5a7a

diff --git a/config.m4 b/config.m4
index bfa56e5..641b16a 100644
--- a/config.m4
+++ b/config.m4
@@ -1,43 +1,44 @@
 PHP_ARG_ENABLE(psi, whether to enable PHP System Interface support,
 [  --enable-psi            Enable PHP System Interface support])
 
+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],
+	[netdb.m4],
+	[syslog.m4],
+	[time.m4],
+	[wchar.m4]], [
+	dnl pecl build
+	sinclude([m4/]incfile)
+	dnl php-src build
+	sinclude([ext/psi/m4/]incfile)
+])
+
 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],
-		[netdb.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
@@ -45,6 +46,7 @@ if test "$PHP_PSI" != no; then
 	AC_FUNC_FNMATCH
 	AC_HEADER_DIRENT
 
+	PSI_CONFIG_INIT
 	PSI_CHECK_STD_TYPES
 	PSI_CHECK_STDINT
 	PSI_CHECK_STDDEF
@@ -64,6 +66,7 @@ if test "$PHP_PSI" != no; then
 	PSI_CHECK_NETDB
 	PSI_CHECK_SYSLOG
 	PSI_CHECK_WCHAR
+	PSI_CONFIG_DONE
 
 	PHP_SUBST(PSI_SHARED_LIBADD)
 
@@ -77,7 +80,6 @@ if test "$PHP_PSI" != no; then
 	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)
 
@@ -95,6 +97,5 @@ if test "$PHP_PSI" != no; then
 	PHP_SUBST(PHP_PSI_BUILDDIR)
 
 	PHP_ADD_MAKEFILE_FRAGMENT
-
 	AC_MSG_RESULT()
 fi