| @@ -1,13 +1,21 @@
--- config.m4.orig 2013-01-26 16:24:21.700122496 +0100
-+++ config.m4 2013-01-26 16:25:16.372122497 +0100
-@@ -31,8 +31,8 @@
++++ config.m4 2013-01-26 16:36:02.528131966 +0100
+@@ -30,9 +30,16 @@
+ 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}'`
++ else
++ EXPECT_VERSION=""
++ fi
++ done
- PHP_ADD_LIBRARY_WITH_PATH(tcl$TCL_VERSION, $TCL_PREFIX/lib, EXPECT_SHARED_LIBADD)
- PHP_ADD_LIBRARY_WITH_PATH(expect, $LIBEXPECT_DIR/lib, EXPECT_SHARED_LIBADD)
+ 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)
|
