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}
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
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
AC_DEFUN(PSI_STRUCT, [
AC_CHECK_SIZEOF($1, [], PSI_INCLUDES_DEFAULT($4))
psi_struct_name=`echo $1 | cut -d" " -f2`
- psi_struct_size=$AS_TR_SH(ac_cv_sizeof_struct_$1)
+ psi_struct_size=$AS_TR_SH(ac_cv_sizeof_$1)
psi_struct_members=
m4_foreach(member, [$2], [
AC_CHECK_MEMBER($1.member, [
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
PSI_MACRO(S_ISREG, int, [(mode_t m)], [(m)], sys/stat.h)
PSI_MACRO(S_ISLNK, int, [(mode_t m)], [(m)], sys/stat.h)
PSI_MACRO(S_ISSOCK, int, [(mode_t m)], [(m)], sys/stat.h)
- PSI_MACRO(S_TYPEISMQ, int, [(mode_t m)], [(m)], sys/stat.h)
- PSI_MACRO(S_TYPEISSEM, int, [(mode_t m)], [(m)], sys/stat.h)
- PSI_MACRO(S_TYPEISSHM, int, [(mode_t m)], [(m)], sys/stat.h)
- PSI_MACRO(S_TYPEISTMO, int, [(mode_t m)], [(m)], sys/stat.h)
+ PSI_MACRO(S_TYPEISMQ, int, [(struct stat *s)], [(s)], sys/stat.h)
+ PSI_MACRO(S_TYPEISSEM, int, [(struct stat *s)], [(s)], sys/stat.h)
+ PSI_MACRO(S_TYPEISSHM, int, [(struct stat *s)], [(s)], sys/stat.h)
+ PSI_MACRO(S_TYPEISTMO, int, [(struct stat *s)], [(s)], sys/stat.h)
dnl sys/time.h
PSI_STRUCT(struct timeval, [
[tv_sec],
AC_DEFINE_UNQUOTED(PHP_PSI_CONSTS, $PSI_CONSTS, Predefined constants)
AC_DEFINE_UNQUOTED(PHP_PSI_STRUCTS, $PSI_STRUCTS, Predefined structs)
- AC_DEFINE_UNQUOTED(PHP_PSI_SHLIB_SUFFIX, $SHLIB_SUFFIX_NAME, DL suffix)
+ AC_DEFINE_UNQUOTED(PHP_PSI_SHLIB_SUFFIX, ["]$SHLIB_SUFFIX_NAME["], DL suffix)
PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(psi)
PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)