Fixed compilation issues (bug #59916)

git-svn-id: https://svn.php.net/repository/pecl/expect/trunk@319689 c90b9560-bf6c-de11-be94-00142212c4b1

config.m4

@@ -5,6 +5,9 @@ dnl
 PHP_ARG_WITH(expect,for expect support, 
 [  --with-expect[=DIR]        Include expect support (requires libexpect >= 5.43.0).])
 
+PHP_ARG_WITH(tcldir,specify path to Tcl needed by expect, 
+[  --with-tcldir[=DIR]        Specify path to Tcl config script (tclConfig.sh).])
+
 if test "$PHP_EXPECT" != "no"; then
 
   for i in $PHP_EXPECT/include/expect.h $PHP_EXPECT/include/*/expect.h \
@@ -18,9 +21,21 @@ if test "$PHP_EXPECT" != "no"; then
     fi
   done
 
+  for i in $PHP_TCLDIR/tclConfig.sh /usr/lib/tcl*/tclConfig.sh \
+        /usr/local/lib/tcl*/tclConfig.sh \
+	/System/Library/Frameworks/Tcl.framework/Versions/Current/tclConfig.sh;
+  do
+    if test -f $i; then
+      . $i
+      break
+    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_INCLUDE($LIBEXPECT_INCLUDE_DIR)
 
   PHP_NEW_EXTENSION(expect, expect.c expect_fopen_wrapper.c, $ext_shared)
   PHP_SUBST(EXPECT_SHARED_LIBADD)
 fi
+

expect.c

@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-  | Author: Michael Spector <michael@zend.com>                           |
+  | Author: Michael Spector <michael@php.net>                            |
   +----------------------------------------------------------------------+
 */
 
@@ -272,8 +272,6 @@ PHP_FUNCTION(expect_expectl)
 	php_stream_from_zval (stream, &z_stream);
 
 	if (!stream->wrapperdata) {
-		php_error_docref (NULL TSRMLS_CC, E_ERROR, "supplied argument is not a valid stream resource");
-		php_error_docref (NULL TSRMLS_CC, E_ERROR, "supplied argument is not a valid stream resource");
 		php_error_docref (NULL TSRMLS_CC, E_ERROR, "supplied argument is not a valid stream resource");
 		return;
 	}

expect_fopen_wrapper.c

@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-  | Author: Michael Spector <michael@zend.com>                           |
+  | Author: Michael Spector <michael@php.net>                            |
   +----------------------------------------------------------------------+
 */
 

package.xml

@@ -14,11 +14,11 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>michael@php.net</email>
   <active>yes</active>
  </lead>
- <date>2011-06-23</date>
- <time>23:40:00</time>
+ <date>2011-11-22</date>
+ <time>18:24:00</time>
  <version>
-  <release>0.3.0</release>
-  <api>0.3.0</api>
+  <release>0.3.1</release>
+  <api>0.3.1</api>
  </version>
  <stability>
   <release>beta</release>
@@ -26,8 +26,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </stability>
  <license uri="http://www.php.net/license">PHP License</license>
  <notes>
-Fixed setting INI parameters (Bug #22566)
-Fixed Segmentation Fault on use (Bug #21578)
+Fixed compilation issue (Bug #59916)
  </notes>
  <contents>
   <dir name="/">

php_expect.h

@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-  | Author: Michael Spector <michael@zend.com>                           |
+  | Author: Michael Spector <michael@php.net>                            |
   +----------------------------------------------------------------------+
 */
 
@@ -37,7 +37,7 @@
 extern zend_module_entry expect_module_entry;
 #define phpext_expect_ptr &expect_module_entry
 
-#define PHP_EXPECT_VERSION "0.2.7-dev"
+#define PHP_EXPECT_VERSION "0.3.1-dev"
 
 #ifdef PHP_WIN32
 #define PHP_EXPECT_API __declspec(dllexport)