| @@ -0,0 +1,23 @@
+--- config.m4.orig 2016-01-11 10:00:55.745951515 +0100
++++ config.m4 2016-01-11 10:04:09.401276824 +0100
+@@ -32,6 +32,11 @@
+ break
+ fi
+ done
++ for i in $PHP_EXPECT/bin/expect $PHP_EXPECT/local/bin/expect ; do
++ if test -x $i ; then
++ EXPECT_VERSION=`$i -v | awk '{print $NF}'`
++ fi
++ done
+ if test -n "$TCL_VERSION" ; then
+ AC_MSG_RESULT($TCL_VERSION in $TCL_PREFIX)
+ else
+@@ -39,7 +44,7 @@
+ fi
+
+ PHP_ADD_LIBRARY_WITH_PATH(tcl$TCL_VERSION, $TCL_PREFIX/$PHP_LIBDIR, EXPECT_SHARED_LIBADD)
+- PHP_ADD_LIBRARY_WITH_PATH(expect, $LIBEXPECT_DIR/$PHP_LIBDIR, EXPECT_SHARED_LIBADD)
++ PHP_ADD_LIBRARY_WITH_PATH(expect$EXPECT_VERSION, $LIBEXPECT_DIR/$PHP_LIBDIR, EXPECT_SHARED_LIBADD)
+ PHP_ADD_INCLUDE($LIBEXPECT_INCLUDE_DIR)
+
+ PHP_NEW_EXTENSION(expect, expect.c expect_fopen_wrapper.c, $ext_shared)
|
