--- embedaddon/php/configure.in	2012/05/29 12:34:34	1.1.1.2
+++ embedaddon/php/configure.in	2013/07/22 01:44:13	1.1.1.2.2.1
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.1.1.2 2012/05/29 12:34:34 misho Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.1.1.2.2.1 2013/07/22 01:44:13 misho Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 dnl include Zend specific macro definitions first
@@ -370,6 +370,7 @@ sinclude(TSRM/tsrm.m4)
 dnl .
 dnl -------------------------------------------------------------------------
 
+PTHREADS_CHECK
 PHP_HELP_SEPARATOR([SAPI modules:])
 PHP_SHLIB_SUFFIX_NAMES
 PHP_BUILD_PROGRAM
@@ -408,6 +409,7 @@ fi
 dnl force ZTS
 if test "$enable_maintainer_zts" = "yes"; then
   PTHREADS_ASSIGN_VARS
+  PTHREADS_FLAGS
 fi
 
 dnl Starting system checks.
@@ -686,7 +688,7 @@ nanosleep \
 )
 
 dnl Some systems (like OpenSolaris) do not have nanosleep in libc
-PHP_CHECK_FUNC(nanosleep, rt)
+PHP_CHECK_FUNC_LIB(nanosleep, rt)
 
 dnl Check for getaddrinfo, should be a better way, but...
 dnl Also check for working getaddrinfo
@@ -1223,7 +1225,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
 EXPANDED_DATADIR=$datadir
 EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
 EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
-INCLUDE_PATH=.:${prefix}/share/pear
+INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
 
 exec_prefix=$old_exec_prefix
 libdir=$old_libdir