X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;fp=src%2Fmodule.c;h=38eca72a9eb315e3d01b1db4858b0f80ad5efbae;hp=e7948d8a0e9abec32534e7665797fa6109e65fdf;hb=5ec2f9ac17f56aee266dc78b4bf657f2cf0910b1;hpb=3e2cb4103d922e025ec566e11439058d44cff872

diff --git a/src/module.c b/src/module.c
index e7948d8..38eca72 100644
--- a/src/module.c
+++ b/src/module.c
@@ -35,6 +35,9 @@
 #include "token.h"
 #include "parser.h"
 
+#define PSI_CPP_SEARCH
+#include "php_psi_cpp.h"
+
 #if HAVE_LIBJIT
 # include "libjit.h"
 # ifndef HAVE_LIBFFI
@@ -236,6 +239,9 @@ static PHP_MINIT_FUNCTION(psi)
 		flags |= PSI_SILENT;
 	}
 
+	PSI_G(search_path) = pemalloc(strlen(PSI_G(directory)) + strlen(psi_cpp_search) + 1 + 1, 1);
+	sprintf(PSI_G(search_path), "%s:%s", PSI_G(directory), psi_cpp_search);
+
 	PSI_G(context) = psi_context_init(NULL, ops, psi_error_wrapper, flags);
 	psi_context_build(PSI_G(context), PSI_G(directory));
 
@@ -268,7 +274,9 @@ static PHP_MINFO_FUNCTION(psi)
 	php_info_print_table_start();
 	php_info_print_table_header(2, "PSI Support", "enabled");
 	php_info_print_table_row(2, "Extension Version", PHP_PSI_VERSION);
+	php_info_print_table_row(2, "Search Path", PSI_G(search_path));
 	php_info_print_table_end();
+
 	php_info_print_table_start();
 	php_info_print_table_header(3, "Used Library", "Compiled", "Linked");
 	php_info_print_table_row(3, "libffi",