flush

[m6w6/ext-psi] / config.m4

diff --git a/config.m4 b/config.m4
index 71ac862fc18c3a4fa9be8ce6076da4f16bbade89..0b117877e5ef399743ddd2e0b6d3229d192c9d80 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -31,6 +31,7 @@ if test "$PHP_PSI" != "no"; then
                AC_MSG_RESULT($PSI_cv_LIBFFI_DIR)
                PHP_EVAL_INCLINE(`$PKG_CONFIG --cflags libffi`)
                PHP_EVAL_LIBLINE(`$PKG_CONFIG --libs libffi`, PSI_SHARED_LIBADD)
+               AC_DEFINE(HAVE_LIBFFI, 1, Have libffi)
        else
                AC_CACHE_CHECK(for libffi, PSI_cv_LIBFFI_DIR, [
                for PSI_cv_LIBFFI_DIR in $PHP_PSI_LIBFFI {/usr{,/local},/opt}{,/libffi}
@@ -45,6 +46,7 @@ if test "$PHP_PSI" != "no"; then
                then
                        PHP_ADD_INCLUDE($PSI_cv_LIBFFI_DIR/include/ffi)
                        PHP_ADD_LIBRARY_WITH_PATH(ffi, $PSI_cv_LIBFFI_DIR/$PHP_LIBDIR, PSI_SHARED_LIBADD)
+                       AC_DEFINE(HAVE_LIBFFI, 1, Have libffi)
                else
                        AC_MSG_WARN([Could not find libffi, please provide the base install path])
                fi
@@ -76,6 +78,7 @@ if test "$PHP_PSI" != "no"; then
        then
                PHP_ADD_INCLUDE($PSI_cv_LIBJIT_DIR/include)
                PHP_ADD_LIBRARY_WITH_PATH(jit, $PSI_cv_LIBJIT_DIR/$PHP_LIBDIR, PSI_SHARED_LIBADD)
+               AC_DEFINE(HAVE_LIBJIT, 1, Have libjit)
        else
                AC_MSG_WARN([Could not find libjit, please provide the base install path])
        fi
@@ -235,7 +238,7 @@ if test "$PHP_PSI" != "no"; then
                                fi
                        ], [], PSI_INCLUDES_DEFAULT($4))
                ])
-               if test "$1" != "$psi_struct_name"
+               if test "$1" = "$psi_struct_name"
                then
                        PSI_TYPES="{PSI_T_STRUCT, \"$psi_struct_name\", \"$psi_struct_name\"}, $PSI_TYPES"
                fi