-diff -burN php-4.3.9RC2.orig/acinclude.m4 php-4.3.9RC2/acinclude.m4
---- php-4.3.9RC2.orig/acinclude.m4 2004-09-04 13:19:39.000000000 +0200
-+++ php-4.3.9RC2/acinclude.m4 2004-09-04 14:24:43.000000000 +0200
+diff -burN php-4.3.10RC2.orig/acinclude.m4 php-4.3.10RC2/acinclude.m4
+--- php-4.3.10RC2.orig/acinclude.m4 2004-12-08 17:48:13.007151096 +0100
++++ php-4.3.10RC2/acinclude.m4 2004-12-08 17:48:45.104271592 +0100
@@ -1629,6 +1629,9 @@
if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
OPENSSL_LIBDIR=$i/lib
test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break
done
-diff -burN php-4.3.9RC2.orig/ext/cpdf/config.m4 php-4.3.9RC2/ext/cpdf/config.m4
---- php-4.3.9RC2.orig/ext/cpdf/config.m4 2004-09-04 13:19:30.000000000 +0200
-+++ php-4.3.9RC2/ext/cpdf/config.m4 2004-09-04 14:24:43.000000000 +0200
+diff -burN php-4.3.10RC2.orig/ext/cpdf/config.m4 php-4.3.10RC2/ext/cpdf/config.m4
+--- php-4.3.10RC2.orig/ext/cpdf/config.m4 2004-12-08 17:48:10.556523648 +0100
++++ php-4.3.10RC2/ext/cpdf/config.m4 2004-12-08 17:48:45.106271288 +0100
@@ -4,7 +4,7 @@
AC_ARG_WITH(jpeg-dir,
[ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[
])
],)
])
-@@ -66,12 +66,12 @@
+@@ -67,12 +67,12 @@
PHP_CHECK_LIBRARY(cpdf, cpdf_open, [
PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
])
break
fi
-diff -burN php-4.3.9RC2.orig/ext/crack/config.m4 php-4.3.9RC2/ext/crack/config.m4
---- php-4.3.9RC2.orig/ext/crack/config.m4 2004-09-04 13:19:32.000000000 +0200
-+++ php-4.3.9RC2/ext/crack/config.m4 2004-09-04 14:24:43.000000000 +0200
+diff -burN php-4.3.10RC2.orig/ext/crack/config.m4 php-4.3.10RC2/ext/crack/config.m4
+--- php-4.3.10RC2.orig/ext/crack/config.m4 2004-12-08 17:48:10.610515440 +0100
++++ php-4.3.10RC2/ext/crack/config.m4 2004-12-08 17:48:45.107271136 +0100
@@ -7,7 +7,7 @@
if test "$PHP_CRACK" != "no"; then
test -f $i/libcrack.$SHLIB_SUFFIX_NAME -o -f $i/libcrack.a && CRACK_LIBDIR=$i && break
done
-diff -burN php-4.3.9RC2.orig/ext/dba/config.m4 php-4.3.9RC2/ext/dba/config.m4
---- php-4.3.9RC2.orig/ext/dba/config.m4 2004-09-04 13:19:30.000000000 +0200
-+++ php-4.3.9RC2/ext/dba/config.m4 2004-09-04 14:24:43.000000000 +0200
-@@ -18,7 +18,7 @@
+diff -burN php-4.3.10RC2.orig/ext/dba/config.m4 php-4.3.10RC2/ext/dba/config.m4
+--- php-4.3.10RC2.orig/ext/dba/config.m4 2004-12-08 17:48:10.512530336 +0100
++++ php-4.3.10RC2/ext/dba/config.m4 2004-12-08 17:50:24.047229976 +0100
+@@ -21,7 +21,7 @@
dnl Assign INCLUDE/LFLAGS from PREFIX
AC_DEFUN(PHP_DBA_STD_ASSIGN,[
if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
fi
])
-@@ -83,7 +83,7 @@
+@@ -86,7 +86,7 @@
AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
AC_DEFINE(DBA_GDBM, 1, [ ])
THIS_LIBS=gdbm
fi
PHP_DBA_STD_ASSIGN
-@@ -115,7 +115,7 @@
+@@ -118,7 +118,7 @@
AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
AC_DEFINE(DBA_NDBM, 1, [ ])
THIS_LIBS=$LIB
if test -n "$THIS_LIBS"; then
break
fi
-@@ -133,8 +133,8 @@
+@@ -136,8 +136,8 @@
dnl parameters(version, library list, function)
AC_DEFUN(PHP_DBA_DB_CHECK,[
for LIB in $2; do
- if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
-- PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib -l$LIB,[
+- PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[
+ if test -f $THIS_PREFIX/lib64/lib$LIB.a -o -f $THIS_PREFIX/lib64/lib$LIB.$SHLIB_SUFFIX_NAME; then
-+ PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib64 -l$LIB,[
++ PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib64, -l$LIB,[
AC_TRY_LINK([
#include "$THIS_INCLUDE"
],[
-@@ -326,7 +326,7 @@
+@@ -329,7 +329,7 @@
fi
AC_DEFINE(DBA_DBM, 1, [ ])
THIS_LIBS=$LIB
if test -n "$THIS_LIBS"; then
break
fi
-@@ -368,7 +368,7 @@
+@@ -371,7 +371,7 @@
AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
AC_DEFINE(DBA_CDB, 1, [ ])
THIS_LIBS=$LIB
if test -n "$THIS_LIBS"; then
break
fi
-diff -burN php-4.3.9RC2.orig/ext/gd/config.m4 php-4.3.9RC2/ext/gd/config.m4
---- php-4.3.9RC2.orig/ext/gd/config.m4 2004-09-04 13:19:30.000000000 +0200
-+++ php-4.3.9RC2/ext/gd/config.m4 2004-09-04 14:24:43.000000000 +0200
+diff -burN php-4.3.10RC2.orig/ext/domxml/config.m4 php-4.3.10RC2/ext/domxml/config.m4
+--- php-4.3.10RC2.orig/ext/domxml/config.m4 2004-12-08 17:48:10.949463912 +0100
++++ php-4.3.10RC2/ext/domxml/config.m4 2004-12-08 17:48:45.138266424 +0100
+@@ -50,7 +50,7 @@
+
+ PHP_DOM_CHECK_VERSION
+
+- if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then
++ if test -f $DOMXML_DIR/lib64/libxml2.a -o -f $DOMXML_DIR/lib64/libxml2.$SHLIB_SUFFIX_NAME; then
+ DOM_LIBNAME=xml2
+ else
+ DOM_LIBNAME=xml
+@@ -145,7 +145,7 @@
+ AC_MSG_ERROR(DOMXSLT requires DOMXML. Use --with-dom=<DIR>)
+ fi
+
+- if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then
++ if test -f $DOMXML_DIR/lib64/libxml2.a -o -f $DOMXML_DIR/lib64/libxml2.$SHLIB_SUFFIX_NAME ; then
+ DOM_LIBNAME=xml2
+ else
+ DOM_LIBNAME=xml
+@@ -154,7 +154,7 @@
+ PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)
+ PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD)
+
+- if test -f $DOMXML_DIR/lib/libxsltbreakpoint.a -o -f $DOMXML_DIR/lib/libxsltbreakpoint.$SHLIB_SUFFIX_NAME ; then
++ if test -f $DOMXML_DIR/lib64/libxsltbreakpoint.a -o -f $DOMXML_DIR/lib64/libxsltbreakpoint.$SHLIB_SUFFIX_NAME ; then
+ PHP_ADD_LIBRARY_WITH_PATH(xsltbreakpoint, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)
+ fi
+
+diff -burN php-4.3.10RC2.orig/ext/gd/config.m4 php-4.3.10RC2/ext/gd/config.m4
+--- php-4.3.10RC2.orig/ext/gd/config.m4 2004-12-08 17:48:10.502531856 +0100
++++ php-4.3.10RC2/ext/gd/config.m4 2004-12-08 17:48:45.115269920 +0100
@@ -51,7 +51,7 @@
if test "$PHP_JPEG_DIR" != "no"; then
test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i"
done
-diff -burN php-4.3.9RC2.orig/ext/imap/config.m4 php-4.3.9RC2/ext/imap/config.m4
---- php-4.3.9RC2.orig/ext/imap/config.m4 2004-09-04 13:19:31.000000000 +0200
-+++ php-4.3.9RC2/ext/imap/config.m4 2004-09-04 14:24:43.000000000 +0200
+diff -burN php-4.3.10RC2.orig/ext/imap/config.m4 php-4.3.10RC2/ext/imap/config.m4
+--- php-4.3.10RC2.orig/ext/imap/config.m4 2004-12-08 17:48:10.564522432 +0100
++++ php-4.3.10RC2/ext/imap/config.m4 2004-12-08 17:48:45.118269464 +0100
@@ -71,7 +71,7 @@
fi
IMAP_LIB_CHK(c-client)
done
-diff -burN php-4.3.9RC2.orig/ext/ldap/config.m4 php-4.3.9RC2/ext/ldap/config.m4
---- php-4.3.9RC2.orig/ext/ldap/config.m4 2004-09-04 13:19:31.000000000 +0200
-+++ php-4.3.9RC2/ext/ldap/config.m4 2004-09-04 14:24:43.000000000 +0200
+diff -burN php-4.3.10RC2.orig/ext/ldap/config.m4 php-4.3.10RC2/ext/ldap/config.m4
+--- php-4.3.10RC2.orig/ext/ldap/config.m4 2004-12-08 17:48:10.569521672 +0100
++++ php-4.3.10RC2/ext/ldap/config.m4 2004-12-08 17:48:45.119269312 +0100
@@ -6,15 +6,15 @@
if test -f $1/include/ldap.h; then
LDAP_DIR=$1
fi
])
-diff -burN php-4.3.9RC2.orig/ext/mcal/config.m4 php-4.3.9RC2/ext/mcal/config.m4
---- php-4.3.9RC2.orig/ext/mcal/config.m4 2004-09-04 15:05:51.000000000 +0200
-+++ php-4.3.9RC2/ext/mcal/config.m4 2004-09-04 14:26:05.000000000 +0200
+diff -burN php-4.3.10RC2.orig/ext/mcal/config.m4 php-4.3.10RC2/ext/mcal/config.m4
+--- php-4.3.10RC2.orig/ext/mcal/config.m4 2004-12-08 17:48:10.571521368 +0100
++++ php-4.3.10RC2/ext/mcal/config.m4 2004-12-08 17:48:45.120269160 +0100
@@ -19,7 +19,7 @@
fi
done
fi
PHP_ADD_INCLUDE($MCAL_INCLUDE)
-diff -burN php-4.3.9RC2.orig/ext/ming/config.m4 php-4.3.9RC2/ext/ming/config.m4
---- php-4.3.9RC2.orig/ext/ming/config.m4 2004-09-04 13:19:31.000000000 +0200
-+++ php-4.3.9RC2/ext/ming/config.m4 2004-09-04 14:45:05.740176712 +0200
+diff -burN php-4.3.10RC2.orig/ext/ming/config.m4 php-4.3.10RC2/ext/ming/config.m4
+--- php-4.3.10RC2.orig/ext/ming/config.m4 2004-12-08 17:48:10.574520912 +0100
++++ php-4.3.10RC2/ext/ming/config.m4 2004-12-08 17:48:45.121269008 +0100
@@ -9,7 +9,7 @@
AC_CHECK_LIB(m, sin)
AC_MSG_CHECKING([for destroySWFBlock])
AC_TRY_RUN([
-diff -burN php-4.3.9RC2.orig/ext/mssql/config.m4 php-4.3.9RC2/ext/mssql/config.m4
---- php-4.3.9RC2.orig/ext/mssql/config.m4 2004-09-04 15:05:54.000000000 +0200
-+++ php-4.3.9RC2/ext/mssql/config.m4 2004-09-04 14:45:31.000000000 +0200
+diff -burN php-4.3.10RC2.orig/ext/mssql/config.m4 php-4.3.10RC2/ext/mssql/config.m4
+--- php-4.3.10RC2.orig/ext/mssql/config.m4 2004-12-08 17:48:10.622513616 +0100
++++ php-4.3.10RC2/ext/mssql/config.m4 2004-12-08 17:49:27.846773744 +0100
@@ -32,12 +32,12 @@
fi
fi
-- if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then
-- AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.so)
-+ if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.so"; then
-+ AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libtds.so)
+- if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then
+- AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.[a|so])
++ if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.so"; then
++ AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libtds.[a|so])
fi
MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include
PHP_ADD_INCLUDE($MSSQL_INCDIR)
PHP_ADD_LIBRARY_WITH_PATH(sybdb, $MSSQL_LIBDIR, MSSQL_SHARED_LIBADD)
-diff -burN php-4.3.9RC2.orig/ext/mysql/config.m4 php-4.3.9RC2/ext/mysql/config.m4
---- php-4.3.9RC2.orig/ext/mysql/config.m4 2004-09-04 13:19:32.000000000 +0200
-+++ php-4.3.9RC2/ext/mysql/config.m4 2004-09-04 14:47:13.000000000 +0200
+diff -burN php-4.3.10RC2.orig/ext/mysql/config.m4 php-4.3.10RC2/ext/mysql/config.m4
+--- php-4.3.10RC2.orig/ext/mysql/config.m4 2004-12-08 17:48:10.623513464 +0100
++++ php-4.3.10RC2/ext/mysql/config.m4 2004-12-08 17:48:45.125268400 +0100
@@ -22,7 +22,7 @@
/var/run/mysqld/mysqld.sock \
/var/tmp/mysql.sock \
/var/mysql/mysql.sock \
/usr/local/mysql/var/mysql.sock \
/Private/tmp/mysql.sock \
-@@ -114,7 +114,7 @@
+@@ -115,7 +115,7 @@
MYSQL_MODULE_TYPE=external
MYSQL_LIB_CHK($i)
done
-@@ -129,9 +129,9 @@
+@@ -130,9 +130,9 @@
PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [
AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.])
], [
else
PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD)
PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [
-diff -burN php-4.3.9RC2.orig/ext/pdf/config.m4 php-4.3.9RC2/ext/pdf/config.m4
---- php-4.3.9RC2.orig/ext/pdf/config.m4 2004-09-04 13:19:30.000000000 +0200
-+++ php-4.3.9RC2/ext/pdf/config.m4 2004-09-04 14:47:13.000000000 +0200
+diff -burN php-4.3.10RC2.orig/ext/pdf/config.m4 php-4.3.10RC2/ext/pdf/config.m4
+--- php-4.3.10RC2.orig/ext/pdf/config.m4 2004-12-08 17:48:10.533527144 +0100
++++ php-4.3.10RC2/ext/pdf/config.m4 2004-12-08 17:48:45.126268248 +0100
@@ -40,11 +40,11 @@
if test "$PHP_JPEG_DIR" != "no"; then
PHP_CHECK_LIBRARY(jpeg,jpeg_read_header,
])
else
AC_MSG_ERROR([pdflib.h not found! Check the path passed to --with-pdflib=<PATH>. PATH should be the install prefix directory.])
-diff -burN php-4.3.9RC2.orig/ext/pgsql/config.m4 php-4.3.9RC2/ext/pgsql/config.m4
---- php-4.3.9RC2.orig/ext/pgsql/config.m4 2004-09-04 13:19:32.000000000 +0200
-+++ php-4.3.9RC2/ext/pgsql/config.m4 2004-09-04 14:47:13.000000000 +0200
+diff -burN php-4.3.10RC2.orig/ext/pgsql/config.m4 php-4.3.10RC2/ext/pgsql/config.m4
+--- php-4.3.10RC2.orig/ext/pgsql/config.m4 2004-12-08 17:48:10.662507536 +0100
++++ php-4.3.10RC2/ext/pgsql/config.m4 2004-12-08 17:48:45.127268096 +0100
@@ -29,7 +29,7 @@
fi
done
if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
PGSQL_LIBDIR=$i/$j
fi
-diff -burN php-4.3.9RC2.orig/ext/xml/config.m4 php-4.3.9RC2/ext/xml/config.m4
---- php-4.3.9RC2.orig/ext/xml/config.m4 2004-09-04 15:05:57.000000000 +0200
-+++ php-4.3.9RC2/ext/xml/config.m4 2004-09-04 15:43:41.371719480 +0200
+diff -burN php-4.3.10RC2.orig/ext/xml/config.m4 php-4.3.10RC2/ext/xml/config.m4
+--- php-4.3.10RC2.orig/ext/xml/config.m4 2004-12-08 17:48:10.542525776 +0100
++++ php-4.3.10RC2/ext/xml/config.m4 2004-12-08 17:48:45.128267944 +0100
@@ -31,7 +31,7 @@
PHP_NEW_EXTENSION(xml, xml.c, $ext_shared)
PHP_SUBST(XML_SHARED_LIBADD)
fi
fi
-diff -burN php-4.3.9RC2.orig/ext/xmlrpc/config.m4 php-4.3.9RC2/ext/xmlrpc/config.m4
---- php-4.3.9RC2.orig/ext/xmlrpc/config.m4 2004-09-04 13:19:34.000000000 +0200
-+++ php-4.3.9RC2/ext/xmlrpc/config.m4 2004-09-04 14:47:13.000000000 +0200
+diff -burN php-4.3.10RC2.orig/ext/xmlrpc/config.m4 php-4.3.10RC2/ext/xmlrpc/config.m4
+--- php-4.3.10RC2.orig/ext/xmlrpc/config.m4 2004-12-08 17:48:11.391396728 +0100
++++ php-4.3.10RC2/ext/xmlrpc/config.m4 2004-12-08 17:48:45.129267792 +0100
@@ -23,9 +23,9 @@
testval=no
PHP_ADD_INCLUDE($i/include)
testval=yes
break
-@@ -88,5 +88,5 @@
- fi
-
+@@ -90,5 +90,5 @@
+ PHP_NEW_EXTENSION(xmlrpc,xmlrpc-epi-php.c,$ext_shared)
+ XMLRPC_MODULE_TYPE=external
PHP_ADD_INCLUDE($XMLRPC_DIR)
- PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib64, XMLRPC_SHARED_LIBADD)
fi
-diff -burN php-4.3.9RC2.orig/ext/xslt/config.m4 php-4.3.9RC2/ext/xslt/config.m4
---- php-4.3.9RC2.orig/ext/xslt/config.m4 2004-09-04 13:19:32.000000000 +0200
-+++ php-4.3.9RC2/ext/xslt/config.m4 2004-09-04 14:47:13.000000000 +0200
+diff -burN php-4.3.10RC2.orig/ext/xslt/config.m4 php-4.3.10RC2/ext/xslt/config.m4
+--- php-4.3.10RC2.orig/ext/xslt/config.m4 2004-12-08 17:48:10.602516656 +0100
++++ php-4.3.10RC2/ext/xslt/config.m4 2004-12-08 17:48:45.130267640 +0100
@@ -98,10 +98,10 @@
found_expat=no
AC_DEFINE(HAVE_XSLT, 1, [ ])
fi
---- php-4.3.9/ext/domxml/config.m4~ 2002-10-30 17:42:36.000000000 +0000
-+++ php-4.3.9/ext/domxml/config.m4 2004-10-09 06:00:17.484073560 +0000
-@@ -50,7 +50,7 @@
-
- PHP_DOM_CHECK_VERSION
-
-- if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then
-+ if test -f $DOMXML_DIR/lib64/libxml2.a -o -f $DOMXML_DIR/lib64/libxml2.$SHLIB_SUFFIX_NAME; then
- DOM_LIBNAME=xml2
- else
- DOM_LIBNAME=xml
-@@ -145,7 +145,7 @@
- AC_MSG_ERROR(DOMXSLT requires DOMXML. Use --with-dom=<DIR>)
- fi
-
-- if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then
-+ if test -f $DOMXML_DIR/lib64/libxml2.a -o -f $DOMXML_DIR/lib64/libxml2.$SHLIB_SUFFIX_NAME ; then
- DOM_LIBNAME=xml2
- else
- DOM_LIBNAME=xml
-@@ -154,7 +154,7 @@
- PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)
- PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD)
-
-- if test -f $DOMXML_DIR/lib/libxsltbreakpoint.a -o -f $DOMXML_DIR/lib/libxsltbreakpoint.$SHLIB_SUFFIX_NAME ; then
-+ if test -f $DOMXML_DIR/lib64/libxsltbreakpoint.a -o -f $DOMXML_DIR/lib64/libxsltbreakpoint.$SHLIB_SUFFIX_NAME ; then
- PHP_ADD_LIBRARY_WITH_PATH(xsltbreakpoint, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)
- fi
-