more travis-trusty fix attempts

[m6w6/ext-psi] / config.m4

diff --git a/config.m4 b/config.m4
index f5c82c1c91350b27b038afb6035483ec23175848..df18db6d66fe51b29e28c0950f4df8067862e90b 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -57,14 +57,17 @@ PHP_ARG_WITH(psi-libffi, where to find libffi,
 
 if test "$PHP_PSI" != no; then
        PHP_CONFIGURE_PART(Configuring PSI)
-       
+
+       save_LIBS=$LIBS
+       LIBS=
+
        PSI_LEMON
        PSI_CHECK_LIBJIT
        PSI_CHECK_LIBFFI
 
        AC_PATH_PROG(NM, nm)
        AC_FUNC_FNMATCH
-       
+
        PSI_CONFIG_INIT
        PSI_CHECK_STD_TYPES
        PSI_CHECK_STDINT
@@ -96,6 +99,9 @@ if test "$PHP_PSI" != no; then
        PSI_CHECK_WCTYPE
        PSI_CONFIG_DONE
 
+       eval_LIBS=$LIBS
+       LIBS=$save_LIBS
+       PHP_EVAL_LIBLINE($eval_LIBS, PSI_SHARED_LIBADD)
        PHP_SUBST(PSI_SHARED_LIBADD)
 
        AC_DEFINE_UNQUOTED(PHP_PSI_SHLIB_SUFFIX, ["$SHLIB_SUFFIX_NAME"], DL suffix)