-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.730950352 +0200
-@@ -1629,6 +1629,9 @@
+diff -urbB php-4.4.0.org/acinclude.m4 php-4.4.0/acinclude.m4
+--- php-4.4.0.org/acinclude.m4 2005-07-11 21:44:02.634975000 +0200
++++ php-4.4.0/acinclude.m4 2005-07-11 21:44:33.630263256 +0200
+@@ -1731,6 +1731,9 @@
if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
OPENSSL_LIBDIR=$i/lib
fi
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.732950048 +0200
+diff -urbB php-4.4.0.org/ext/cpdf/config.m4 php-4.4.0/ext/cpdf/config.m4
+--- php-4.4.0.org/ext/cpdf/config.m4 2004-12-30 08:02:16.000000000 +0100
++++ php-4.4.0/ext/cpdf/config.m4 2005-07-11 21:44:33.631263104 +0200
@@ -4,7 +4,7 @@
AC_ARG_WITH(jpeg-dir,
[ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[
CPDF_JPEG_DIR=$i
break;
fi
-@@ -14,11 +14,11 @@
+@@ -13,11 +13,11 @@
AC_MSG_ERROR([libjpeg.(a|so) not found.])
fi
PHP_CHECK_LIBRARY(jpeg, jpeg_read_header, [
])
],)
])
-@@ -27,7 +27,7 @@
+@@ -26,7 +26,7 @@
AC_ARG_WITH(tiff-dir,
[ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[
for i in $withval /usr/local /usr; do
CPDF_TIFF_DIR=$i
break;
fi
-@@ -37,11 +37,11 @@
+@@ -35,11 +35,11 @@
AC_MSG_ERROR([libtiff.(a|so) not found.])
fi
PHP_CHECK_LIBRARY(tiff, TIFFOpen, [
])
],)
])
-@@ -66,12 +66,12 @@
-
- PHP_CHECK_LIBRARY(cpdf, cpdf_open, [
- PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
-- PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib, CPDF_SHARED_LIBADD)
-+ PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib64, CPDF_SHARED_LIBADD)
- AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])
+@@ -65,13 +65,13 @@
], [
AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
], [
- -L$i/lib $CPDF_SHARED_LIBADD
+ -L$i/lib64 $CPDF_SHARED_LIBADD
])
- 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.735949592 +0200
+ ], [
+- -L$i/lib $CPDF_SHARED_LIBADD
++ -L$i/lib64 $CPDF_SHARED_LIBADD
+ ])
+
+- PHP_ADD_LIBRARY_WITH_PATH($cpdf_libname, $i/lib, CPDF_SHARED_LIBADD)
++ PHP_ADD_LIBRARY_WITH_PATH($cpdf_libname, $i/lib64, CPDF_SHARED_LIBADD)
+ PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
+ AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])
+ break
+diff -urbB php-4.4.0.org/ext/crack/config.m4 php-4.4.0/ext/crack/config.m4
+--- php-4.4.0.org/ext/crack/config.m4 2004-12-31 04:10:59.000000000 +0100
++++ php-4.4.0/ext/crack/config.m4 2005-07-11 21:44:33.631263104 +0200
@@ -7,7 +7,7 @@
if test "$PHP_CRACK" != "no"; then
- for i in $PHP_CRACK/lib $PHP_CRACK/cracklib /usr/local/lib /usr/lib; do
+ for i in $PHP_CRACK/lib64 $PHP_CRACK/cracklib /usr/local/lib64 /usr/lib64; do
test -f $i/libcrack.$SHLIB_SUFFIX_NAME -o -f $i/libcrack.a && CRACK_LIBDIR=$i && break
+ test -f $i/libcrack_krb5.$SHLIB_SUFFIX_NAME -o -f $i/libcrack_krb5.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.737949288 +0200
-@@ -18,7 +18,7 @@
+diff -urbB php-4.4.0.org/ext/dba/config.m4 php-4.4.0/ext/dba/config.m4
+--- php-4.4.0.org/ext/dba/config.m4 2005-07-11 21:44:02.637974000 +0200
++++ php-4.4.0/ext/dba/config.m4 2005-07-11 21:44:33.632262952 +0200
+@@ -21,7 +21,7 @@
dnl Assign INCLUDE/LFLAGS from PREFIX
- AC_DEFUN(PHP_DBA_STD_ASSIGN,[
+ AC_DEFUN([PHP_DBA_STD_ASSIGN],[
if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
- THIS_LFLAGS=$THIS_PREFIX/lib
+ THIS_LFLAGS=$THIS_PREFIX/lib64
fi
])
-@@ -83,7 +83,7 @@
+@@ -85,7 +85,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 @@
+@@ -117,7 +117,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 @@
+@@ -135,8 +135,8 @@
dnl parameters(version, library list, function)
- AC_DEFUN(PHP_DBA_DB_CHECK,[
+ 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 @@
+@@ -328,7 +328,7 @@
fi
AC_DEFINE(DBA_DBM, 1, [ ])
THIS_LIBS=$LIB
if test -n "$THIS_LIBS"; then
break
fi
-@@ -368,7 +368,7 @@
+@@ -370,7 +370,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.740948832 +0200
+diff -urbB php-4.4.0.org/ext/domxml/config.m4 php-4.4.0/ext/domxml/config.m4
+--- php-4.4.0.org/ext/domxml/config.m4 2004-12-30 08:02:17.000000000 +0100
++++ php-4.4.0/ext/domxml/config.m4 2005-07-11 21:44:33.632262952 +0200
+@@ -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
+@@ -62,7 +62,7 @@
+ DOM_LIBS=`$XML2_CONFIG --libs`
+ PHP_EVAL_LIBLINE($DOM_LIBS, DOMXML_SHARED_LIBADD)
+ else
+- PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)
++ PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib64, DOMXML_SHARED_LIBADD)
+ fi
+
+ PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD)
+@@ -70,7 +70,7 @@
+ if test "$PHP_ZLIB_DIR" = "no"; then
+ AC_MSG_ERROR(DOMXML requires ZLIB. Use --with-zlib-dir=<DIR>)
+ else
+- PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, DOMXML_SHARED_LIBADD)
++ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib64, DOMXML_SHARED_LIBADD)
+ fi
+
+ AC_DEFINE(HAVE_DOMXML,1,[ ])
+@@ -137,7 +137,7 @@
+
+ PHP_DOM_XSLT_CHECK_VERSION
+
+- PHP_ADD_LIBRARY_WITH_PATH(xslt, $DOMXSLT_DIR/lib, DOMXML_SHARED_LIBADD)
++ PHP_ADD_LIBRARY_WITH_PATH(xslt, $DOMXSLT_DIR/lib64, DOMXML_SHARED_LIBADD)
+
+ PHP_ADD_INCLUDE($DOMXSLT_DIR/include)
+
+@@ -145,17 +145,17 @@
+ 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
+ fi
+
+- PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)
++ PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib64, 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
+- PHP_ADD_LIBRARY_WITH_PATH(xsltbreakpoint, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)
++ 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/lib64, DOMXML_SHARED_LIBADD)
+ fi
+
+ AC_DEFINE(HAVE_DOMXSLT,1,[ ])
+@@ -187,7 +187,7 @@
+
+ PHP_DOM_EXSLT_CHECK_VERSION
+
+- PHP_ADD_LIBRARY_WITH_PATH(exslt, $DOMEXSLT_DIR/lib, DOMXML_SHARED_LIBADD)
++ PHP_ADD_LIBRARY_WITH_PATH(exslt, $DOMEXSLT_DIR/lib64, DOMXML_SHARED_LIBADD)
+
+ PHP_ADD_INCLUDE($DOMEXSLT_DIR/include)
+
+diff -urbB php-4.4.0.org/ext/gd/config.m4 php-4.4.0/ext/gd/config.m4
+--- php-4.4.0.org/ext/gd/config.m4 2005-05-17 14:23:09.000000000 +0200
++++ php-4.4.0/ext/gd/config.m4 2005-07-11 21:44:33.633262800 +0200
@@ -51,7 +51,7 @@
if test "$PHP_JPEG_DIR" != "no"; then
])
fi
])
-@@ -362,7 +362,7 @@
+@@ -365,7 +365,7 @@
done
dnl Library path
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.764945184 +0200
-@@ -71,7 +71,7 @@
- fi
-
- for i in $SEARCH_PATHS; do
-- if test -f $i/lib/libkrb5.a || test -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME; then
-+ if test -f $i/lib64/libkrb5.a || test -f $i/lib64/libkrb5.$SHLIB_SUFFIX_NAME; then
- PHP_KERBEROS_DIR=$i
- break
- fi
-@@ -84,7 +84,7 @@
- ])
- fi
- AC_DEFINE(HAVE_IMAP_KRB,1,[ ])
-- PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, IMAP_SHARED_LIBADD)
-+ PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib64, IMAP_SHARED_LIBADD)
- PHP_ADD_LIBRARY(gssapi_krb5, 1, IMAP_SHARED_LIBADD)
- PHP_ADD_LIBRARY(krb5, 1, IMAP_SHARED_LIBADD)
- PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD)
-@@ -116,11 +116,11 @@
- AC_MSG_CHECKING([whether SSL libraries are needed for c-client])
-
- if test "$PHP_IMAP_SSL" != "no"; then
-- AC_MSG_RESULT([$PHP_IMAP_SSL/lib])
-+ AC_MSG_RESULT([$PHP_IMAP_SSL/lib64])
- AC_DEFINE(HAVE_IMAP_SSL,1,[ ])
- PHP_ADD_LIBRARY_DEFER(ssl, 1, IMAP_SHARED_LIBADD)
- PHP_ADD_LIBRARY_DEFER(crypto, 1, IMAP_SHARED_LIBADD)
-- PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
-+ PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib64, IMAP_SHARED_LIBADD)
- else
- AC_MSG_RESULT(no)
- fi
-@@ -178,13 +178,13 @@
+diff -urbB php-4.4.0.org/ext/imap/config.m4 php-4.4.0/ext/imap/config.m4
+--- php-4.4.0.org/ext/imap/config.m4 2005-01-11 05:56:57.000000000 +0100
++++ php-4.4.0/ext/imap/config.m4 2005-07-11 21:44:33.634262648 +0200
+@@ -160,13 +160,13 @@
if test -r "$IMAP_DIR/c-client/c-client.a"; then
ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
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.786941840 +0200
+diff -urbB php-4.4.0.org/ext/ldap/config.m4 php-4.4.0/ext/ldap/config.m4
+--- php-4.4.0.org/ext/ldap/config.m4 2005-05-08 18:06:24.000000000 +0200
++++ php-4.4.0/ext/ldap/config.m4 2005-07-11 21:44:33.634262648 +0200
@@ -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 13:19:31.000000000 +0200
-+++ php-4.3.9RC2/ext/mcal/config.m4 2004-09-04 14:26:05.237559464 +0200
-@@ -19,8 +19,8 @@
+diff -urbB php-4.4.0.org/ext/mcal/config.m4 php-4.4.0/ext/mcal/config.m4
+--- php-4.4.0.org/ext/mcal/config.m4 2005-07-11 21:44:02.612978000 +0200
++++ php-4.4.0/ext/mcal/config.m4 2005-07-11 21:44:33.635262496 +0200
+@@ -19,7 +19,7 @@
fi
done
- for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib/mcal $MCAL_DIR/lib; do
-- if test -r "$i/libmcal.a"; then
+ for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib64 $MCAL_DIR/lib64/mcal $MCAL_DIR/lib64; do
-+ if test -r "$i/libmcal.so" -o -r "$i/libmcal.a"; then
+ if test -r "$i/libmcal.so" -o -r "$i/libmcal.a"; then
MCAL_LIBRARY=$i
fi
- done
-@@ -31,8 +31,8 @@
- fi
+@@ -32,7 +32,7 @@
done
-- if test ! -f "$MCAL_LIBRARY/libmcal.a"; then
-- AC_MSG_ERROR(Unable to locate your libmcal library files - libmcal.a should be in the directory you specify or in the lib/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH)
-+ if test ! -f "$MCAL_LIBRARY/libmcal.a" -a ! -f "$MCAL_LIBRARY/libmcal.so"; then
+ if test ! -f "$MCAL_LIBRARY/libmcal.a" -a ! -f "$MCAL_LIBRARY/libmcal.so"; then
+- AC_MSG_ERROR(Unable to locate your libmcal library files - libmcal.* should be in the directory you specify or in the lib/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH)
+ AC_MSG_ERROR(Unable to locate your libmcal library files - libmcal.* should be in the directory you specify or in the lib64/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH)
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 -urbB php-4.4.0.org/ext/ming/config.m4 php-4.4.0/ext/ming/config.m4
+--- php-4.4.0.org/ext/ming/config.m4 2003-07-11 09:48:33.000000000 +0200
++++ php-4.4.0/ext/ming/config.m4 2005-07-11 21:44:33.635262496 +0200
@@ -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 13:19:32.000000000 +0200
-+++ php-4.3.9RC2/ext/mssql/config.m4 2004-09-04 14:45:31.009335216 +0200
+diff -urbB php-4.4.0.org/ext/mssql/config.m4 php-4.4.0/ext/mssql/config.m4
+--- php-4.4.0.org/ext/mssql/config.m4 2004-12-08 19:59:11.000000000 +0100
++++ php-4.4.0/ext/mssql/config.m4 2005-07-11 21:44:33.635262496 +0200
@@ -32,12 +32,12 @@
fi
fi
-- if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.a"; then
-- AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.a)
-+ 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/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib/libsybdb.so"; then
+- AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libsybdb.[a|so])
++ if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libsybdb.so"; then
++ AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libsybdb.[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.436763880 +0200
+diff -urbB php-4.4.0.org/ext/mysql/config.m4 php-4.4.0/ext/mysql/config.m4
+--- php-4.4.0.org/ext/mysql/config.m4 2005-07-11 21:44:02.630975000 +0200
++++ php-4.4.0/ext/mysql/config.m4 2005-07-11 21:44:33.636262344 +0200
@@ -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.438763576 +0200
-@@ -40,11 +40,11 @@
- if test "$PHP_JPEG_DIR" != "no"; then
- PHP_CHECK_LIBRARY(jpeg,jpeg_read_header,
- [
-- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDF_SHARED_LIBADD)
-+ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib64, PDF_SHARED_LIBADD)
- ],[
- AC_MSG_ERROR([libjpeg not found!])
- ],[
-- -L$PHP_JPEG_DIR/lib
-+ -L$PHP_JPEG_DIR/lib64
- ])
- else
- AC_MSG_WARN([If configure fails, try --with-jpeg-dir=<DIR>])
-@@ -54,11 +54,11 @@
- if test "$PHP_PNG_DIR" != "no"; then
- PHP_CHECK_LIBRARY(png,png_create_info_struct,
- [
-- PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDF_SHARED_LIBADD)
-+ PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib64, PDF_SHARED_LIBADD)
- ],[
- AC_MSG_ERROR([libpng not found!])
- ],[
-- -L$PHP_PNG_DIR/lib
-+ -L$PHP_PNG_DIR/lib64
- ])
- else
- AC_MSG_WARN([If configure fails, try --with-png-dir=<DIR>])
-@@ -68,11 +68,11 @@
- if test "$PHP_TIFF_DIR" != "no"; then
- PHP_CHECK_LIBRARY(tiff,TIFFOpen,
- [
-- PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDF_SHARED_LIBADD)
-+ PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib64, PDF_SHARED_LIBADD)
- ],[
- AC_MSG_ERROR([libtiff not found!])
- ],[
-- -L$PHP_TIFF_DIR/lib
-+ -L$PHP_TIFF_DIR/lib64
- ])
- else
- AC_MSG_WARN([If configure fails, try --with-tiff-dir=<DIR>])
-@@ -84,7 +84,7 @@
- AC_MSG_RESULT([no. If configure fails, try --with-zlib-dir=<DIR>])
- else
- AC_MSG_RESULT([$PHP_ZLIB_DIR])
-- PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDF_SHARED_LIBADD)
-+ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib64, PDF_SHARED_LIBADD)
- fi
-
- dnl #
-@@ -118,7 +118,7 @@
- PHP_CHECK_LIBRARY(pdf, PDF_show_boxed,
- [
- AC_DEFINE(HAVE_PDFLIB,1,[ ])
-- PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDF_SHARED_LIBADD)
-+ PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib64, PDF_SHARED_LIBADD)
- PHP_ADD_INCLUDE($PHP_PDFLIB/include)
- ],[
- AC_MSG_ERROR([
-@@ -127,7 +127,7 @@
- See config.log for more information.
- ])
- ],[
-- -L$PHP_PDFLIB/lib $PDF_SHARED_LIBADD
-+ -L$PHP_PDFLIB/lib64 $PDF_SHARED_LIBADD
- ])
- 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.440763272 +0200
-@@ -29,7 +29,7 @@
- fi
- done
-
-- for j in lib lib/pgsql lib/postgres lib/postgresql ""; do
-+ for j in lib64 lib64/pgsql lib64/postgres lib64/postgresql ""; do
- 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 13:19:30.000000000 +0200
-+++ php-4.3.9RC2/ext/xml/config.m4 2004-09-04 14:48:42.401239224 +0200
-@@ -30,7 +30,7 @@
- else
+diff -urbB php-4.4.0.org/ext/xml/config.m4 php-4.4.0/ext/xml/config.m4
+--- php-4.4.0.org/ext/xml/config.m4 2005-07-11 21:44:02.598980000 +0200
++++ php-4.4.0/ext/xml/config.m4 2005-07-11 21:44:33.637262192 +0200
+@@ -31,7 +31,7 @@
PHP_NEW_EXTENSION(xml, xml.c, $ext_shared)
-- for i in $PHP_XML $PHP_EXPAT_DIR; do
-+ for i in /usr /usr/local $PHP_XML `echo $PHP_EXPAT_DIR | sed -e s/shared,//` ; do
- if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then
+ for i in /usr /usr/local $PHP_XML `echo $PHP_EXPAT_DIR | sed -e s/shared,//` ; do
+- if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then
++ if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME ; then
EXPAT_DIR=$i
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.442762968 +0200
+ done
+@@ -41,7 +41,7 @@
+ fi
+
+ PHP_ADD_INCLUDE($EXPAT_DIR/include)
+- PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD)
++ PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib64, XML_SHARED_LIBADD)
+ PHP_SUBST(XML_SHARED_LIBADD)
+ fi
+ fi
+diff -urbB php-4.4.0.org/ext/xmlrpc/config.m4 php-4.4.0/ext/xmlrpc/config.m4
+--- php-4.4.0.org/ext/xmlrpc/config.m4 2005-07-11 21:44:02.632975000 +0200
++++ php-4.4.0/ext/xmlrpc/config.m4 2005-07-11 21:44:33.637262192 +0200
@@ -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.444762664 +0200
+diff -urbB php-4.4.0.org/ext/xslt/config.m4 php-4.4.0/ext/xslt/config.m4
+--- php-4.4.0.org/ext/xslt/config.m4 2004-08-18 07:14:16.000000000 +0200
++++ php-4.4.0/ext/xslt/config.m4 2005-07-11 21:44:33.638262040 +0200
@@ -98,10 +98,10 @@
found_expat=no
PHP_SABLOT_JS_DIR=$i
break
fi
-@@ -133,12 +133,12 @@
-
+@@ -134,11 +134,11 @@
PHP_CHECK_LIBRARY(js, JS_GetRuntime,
[
-- PHP_ADD_LIBRARY_WITH_PATH(js, $PHP_SABLOT_JS_DIR/lib, XSLT_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(js, $PHP_SABLOT_JS_DIR/lib, XSLT_SHARED_LIBADD)
- PHP_SABLOT_JS_LIBS="-L$PHP_SABLOT_JS_DIR/lib -ljs"
-+ PHP_ADD_LIBRARY_WITH_PATH(js, $PHP_SABLOT_JS_DIR/lib64, XSLT_SHARED_LIBADD)
+ PHP_SABLOT_JS_LIBS="-L$PHP_SABLOT_JS_DIR/lib64 -ljs"
], [
AC_MSG_ERROR([libjs not found. Please check config.log for more information.])
AC_DEFINE(HAVE_XSLT, 1, [ ])
fi
+diff -urbB php-4.4.0.org/php.ini php-4.4.0/php.ini
+--- php-4.4.0.org/php.ini 2005-07-11 21:44:02.628976000 +0200
++++ php-4.4.0/php.ini 2005-07-11 21:44:33.639261888 +0200
+@@ -489,7 +489,7 @@
+ user_dir =
+
+ ; Directory in which the loadable extensions (modules) reside.
+-extension_dir = "/usr/lib/php4"
++extension_dir = "/usr/lib64/php4"
+
+ ; Whether or not to enable the dl() function. The dl() function does NOT work
+ ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
+
+--- ./ext/pcre/config0.m4~ 2005-05-31 15:22:27.000000000 +0300
++++ ./ext/pcre/config0.m4 2005-09-29 17:42:21.000000000 +0300
+@@ -25,7 +25,7 @@
+ AC_MSG_ERROR([Could not find pcre.h in $PHP_PCRE_REGEX])
+ fi
+
+- for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/lib; do
++ for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/lib64; do
+ test -f $j/libpcre.a -o -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
+ done
+
projects / packages / php4.git / blobdiff