- this patch depends on other patches...

Changed files:
    php4-lib64.patch -> 1.8

diff --git a/php4-lib64.patch b/php4-lib64.patch
index 6f0494738c9bba6bcf5ecaa752e0f59fec1f8d25..c4d134be56c7b5c3d40f3446a1581d388d2e8ad1 100644 (file)
--- a/php4-lib64.patch
+++ b/php4-lib64.patch
@@ -1,6 +1,6 @@
 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 13:27:55.037150576 +0200
++++ php-4.3.9RC2/acinclude.m4  2004-09-04 14:24:43.730950352 +0200
 @@ -1629,6 +1629,9 @@
        if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
          OPENSSL_LIBDIR=$i/lib
@@ -13,7 +13,7 @@ diff -burN php-4.3.9RC2.orig/acinclude.m4 php-4.3.9RC2/acinclude.m4
  
 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 13:30:18.700310456 +0200
++++ php-4.3.9RC2/ext/cpdf/config.m4    2004-09-04 14:24:43.732950048 +0200
 @@ -4,7 +4,7 @@
    AC_ARG_WITH(jpeg-dir,
    [  --with-jpeg-dir[=DIR]     CPDF: Set the path to libjpeg install prefix.],[
@@ -77,7 +77,7 @@ diff -burN php-4.3.9RC2.orig/ext/cpdf/config.m4 php-4.3.9RC2/ext/cpdf/config.m4
        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 13:30:55.152768840 +0200
++++ php-4.3.9RC2/ext/crack/config.m4   2004-09-04 14:24:43.735949592 +0200
 @@ -7,7 +7,7 @@
  
  if test "$PHP_CRACK" != "no"; then
@@ -89,7 +89,7 @@ diff -burN php-4.3.9RC2.orig/ext/crack/config.m4 php-4.3.9RC2/ext/crack/config.m
  
 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 13:33:24.245103360 +0200
++++ php-4.3.9RC2/ext/dba/config.m4     2004-09-04 14:24:43.737949288 +0200
 @@ -18,7 +18,7 @@
  dnl Assign INCLUDE/LFLAGS from PREFIX
  AC_DEFUN(PHP_DBA_STD_ASSIGN,[
@@ -148,7 +148,7 @@ diff -burN php-4.3.9RC2.orig/ext/dba/config.m4 php-4.3.9RC2/ext/dba/config.m4
          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 13:43:43.214005784 +0200
++++ php-4.3.9RC2/ext/gd/config.m4      2004-09-04 14:24:43.740948832 +0200
 @@ -51,7 +51,7 @@
    if test "$PHP_JPEG_DIR" != "no"; then
  
@@ -265,7 +265,7 @@ diff -burN php-4.3.9RC2.orig/ext/gd/config.m4 php-4.3.9RC2/ext/gd/config.m4
  
 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 13:49:32.369926016 +0200
++++ php-4.3.9RC2/ext/imap/config.m4    2004-09-04 14:24:43.764945184 +0200
 @@ -71,7 +71,7 @@
      fi
  
@@ -317,7 +317,7 @@ diff -burN php-4.3.9RC2.orig/ext/imap/config.m4 php-4.3.9RC2/ext/imap/config.m4
  
 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 13:49:53.713681272 +0200
++++ php-4.3.9RC2/ext/ldap/config.m4    2004-09-04 14:24:43.786941840 +0200
 @@ -6,15 +6,15 @@
    if test -f $1/include/ldap.h; then
      LDAP_DIR=$1
@@ -339,28 +339,32 @@ diff -burN php-4.3.9RC2.orig/ext/ldap/config.m4 php-4.3.9RC2/ext/ldap/config.m4
  
 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 13:50:44.901899480 +0200
-@@ -19,7 +19,7 @@
++++ php-4.3.9RC2/ext/mcal/config.m4    2004-09-04 14:26:05.237559464 +0200
+@@ -19,8 +19,8 @@
      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.a"; then
++    if test -r "$i/libmcal.so" -o -r "$i/libmcal.a"; then
        MCAL_LIBRARY=$i
      fi
-@@ -32,7 +32,7 @@
+   done
+@@ -31,8 +31,8 @@
+     fi
    done
  
-   if test ! -f "$MCAL_LIBRARY/libmcal.a"; then
+-  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)
-+    AC_MSG_ERROR(Unable to locate your libmcal library files - libmcal.a should be in the directory you specify or in the lib64/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH)
++  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 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 13:51:23.449039424 +0200
++++ php-4.3.9RC2/ext/ming/config.m4    2004-09-04 14:45:05.740176712 +0200
 @@ -9,7 +9,7 @@
    AC_CHECK_LIB(m, sin)
  
@@ -386,15 +390,15 @@ diff -burN php-4.3.9RC2.orig/ext/ming/config.m4 php-4.3.9RC2/ext/ming/config.m4
    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 13:52:02.906041048 +0200
++++ php-4.3.9RC2/ext/mssql/config.m4   2004-09-04 14:45:31.009335216 +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.a"; then
-+     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libtds.a)
++  if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.so"; then
++     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libtds.so)
    fi
  
    MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include
@@ -405,7 +409,7 @@ diff -burN php-4.3.9RC2.orig/ext/mssql/config.m4 php-4.3.9RC2/ext/mssql/config.m
    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 13:53:02.477984736 +0200
++++ php-4.3.9RC2/ext/mysql/config.m4   2004-09-04 14:47:13.436763880 +0200
 @@ -22,7 +22,7 @@
      /var/run/mysqld/mysqld.sock \
      /var/tmp/mysql.sock \
@@ -438,7 +442,7 @@ diff -burN php-4.3.9RC2.orig/ext/mysql/config.m4 php-4.3.9RC2/ext/mysql/config.m
        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 13:55:04.396450312 +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, 
@@ -510,7 +514,7 @@ diff -burN php-4.3.9RC2.orig/ext/pdf/config.m4 php-4.3.9RC2/ext/pdf/config.m4
          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 13:55:37.372437200 +0200
++++ php-4.3.9RC2/ext/pgsql/config.m4   2004-09-04 14:47:13.440763272 +0200
 @@ -29,7 +29,7 @@
        fi
      done
@@ -522,28 +526,19 @@ diff -burN php-4.3.9RC2.orig/ext/pgsql/config.m4 php-4.3.9RC2/ext/pgsql/config.m
        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 13:56:25.558111864 +0200
-@@ -31,7 +31,7 @@
++++ php-4.3.9RC2/ext/xml/config.m4     2004-09-04 14:48:42.401239224 +0200
+@@ -30,7 +30,7 @@
+   else
      PHP_NEW_EXTENSION(xml, xml.c, $ext_shared)
  
-     for i in $PHP_XML $PHP_EXPAT_DIR; 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
+-    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
          EXPAT_DIR=$i
        fi
-     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 -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 13:57:19.560902192 +0200
++++ php-4.3.9RC2/ext/xmlrpc/config.m4  2004-09-04 14:47:13.442762968 +0200
 @@ -23,9 +23,9 @@
  
    testval=no
@@ -565,7 +560,7 @@ diff -burN php-4.3.9RC2.orig/ext/xmlrpc/config.m4 php-4.3.9RC2/ext/xmlrpc/config
  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 13:59:10.717003896 +0200
++++ php-4.3.9RC2/ext/xslt/config.m4    2004-09-04 14:47:13.444762664 +0200
 @@ -98,10 +98,10 @@
  
      found_expat=no