php-lib64.patch

   1 diff -burN php-5.0.4RC1.orig/acinclude.m4 php-5.0.4RC1/acinclude.m4
   2 --- php-5.0.4RC1.orig/acinclude.m4      2005-03-15 18:21:05.158404416 +0100
   3 +++ php-5.0.4RC1/acinclude.m4   2005-03-15 18:22:03.101595712 +0100
   4 @@ -1723,6 +1723,9 @@
   5        if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
   6          OPENSSL_LIBDIR=$i/lib
   7        fi
   8 +      if test -r $i/lib64/libssl.a -o -r $i/lib64/libssl.$SHLIB_SUFFIX_NAME; then
   9 +        OPENSSL_LIBDIR=$i/lib64
  10 +      fi
  11        test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break
  12      done
  13
  14 diff -burN php-5.0.4RC1.orig/ext/cpdf/config.m4 php-5.0.4RC1/ext/cpdf/config.m4
  15 --- php-5.0.4RC1.orig/ext/cpdf/config.m4        2005-03-15 18:21:04.537498808 +0100
  16 +++ php-5.0.4RC1/ext/cpdf/config.m4     2005-03-15 18:23:06.693928208 +0100
  17 @@ -4,7 +4,7 @@
  18    AC_ARG_WITH(jpeg-dir,
  19    [  --with-jpeg-dir[=DIR]     CPDF: Set the path to libjpeg install prefix.],[
  20      for i in $withval /usr/local /usr; do
  21 -      if test -f "$i/lib/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libjpeg.a"; then
  22 +      if test -f "$i/lib64/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib64/libjpeg.a"; then
  23          CPDF_JPEG_DIR=$i
  24          break;
  25        fi
  26 @@ -13,11 +13,11 @@
  27        AC_MSG_ERROR([libjpeg.(a|so) not found.])
  28      fi
  29      PHP_CHECK_LIBRARY(jpeg, jpeg_read_header, [
  30 -      PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib, CPDF_SHARED_LIBADD)
  31 +      PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib64, CPDF_SHARED_LIBADD)
  32      ] ,[
  33        AC_MSG_ERROR([CPDF: Problem with libjpeg.(a|so). Please check config.log for more information.])
  34      ], [
  35 -      -L$CPDF_JPEG_DIR/lib
  36 +      -L$CPDF_JPEG_DIR/lib64
  37      ])
  38    ],)
  39  ])
  40 @@ -26,7 +26,7 @@
  41    AC_ARG_WITH(tiff-dir,
  42    [  --with-tiff-dir[=DIR]     CPDF: Set the path to libtiff install prefix.],[
  43      for i in $withval /usr/local /usr; do
  44 -      if test -f "$i/lib/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libtiff.a"; then
  45 +      if test -f "$i/lib64/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib64/libtiff.a"; then
  46          CPDF_TIFF_DIR=$i
  47          break;
  48        fi
  49 @@ -35,11 +35,11 @@
  50        AC_MSG_ERROR([libtiff.(a|so) not found.])
  51      fi
  52      PHP_CHECK_LIBRARY(tiff, TIFFOpen, [
  53 -      PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib, CPDF_SHARED_LIBADD)
  54 +      PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib64, CPDF_SHARED_LIBADD)
  55      ] ,[
  56        AC_MSG_ERROR([CPDF: Problem with libtiff.(a|so). Please check config.log for more information.])
  57      ], [
  58 -      -L$CPDF_TIFF_DIR/lib
  59 +      -L$CPDF_TIFF_DIR/lib64
  60      ])
  61    ],)
  62  ])
  63 @@ -65,13 +65,13 @@
  64          ], [
  65            AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
  66          ], [
  67 -          -L$i/lib $CPDF_SHARED_LIBADD
  68 +          -L$i/lib64 $CPDF_SHARED_LIBADD
  69          ])
  70        ], [
  71 -        -L$i/lib $CPDF_SHARED_LIBADD
  72 +        -L$i/lib64 $CPDF_SHARED_LIBADD
  73        ])
  74
  75 -      PHP_ADD_LIBRARY_WITH_PATH($cpdf_libname, $i/lib, CPDF_SHARED_LIBADD)
  76 +      PHP_ADD_LIBRARY_WITH_PATH($cpdf_libname, $i/lib64, CPDF_SHARED_LIBADD)
  77        PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
  78        AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])
  79        break
  80 diff -burN php-5.0.4RC1.orig/ext/dba/config.m4 php-5.0.4RC1/ext/dba/config.m4
  81 --- php-5.0.4RC1.orig/ext/dba/config.m4 2005-03-15 18:21:04.484506864 +0100
  82 +++ php-5.0.4RC1/ext/dba/config.m4      2005-03-15 18:22:03.103595408 +0100
  83 @@ -21,7 +21,7 @@
  84  dnl Assign INCLUDE/LFLAGS from PREFIX
  85  AC_DEFUN([PHP_DBA_STD_ASSIGN],[
  86    if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
  87 -    THIS_LFLAGS=$THIS_PREFIX/lib
  88 +    THIS_LFLAGS=$THIS_PREFIX/lib64
  89    fi
  90  ])
  91
  92 @@ -120,7 +120,7 @@
  93          AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
  94          AC_DEFINE(DBA_GDBM, 1, [ ])
  95          THIS_LIBS=gdbm
  96 -      ], [], [-L$THIS_PREFIX/lib])
  97 +      ], [], [-L$THIS_PREFIX/lib64])
  98      fi
  99
 100      PHP_DBA_STD_ASSIGN
 101 @@ -152,7 +152,7 @@
 102            AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
 103            AC_DEFINE(DBA_NDBM, 1, [ ])
 104            THIS_LIBS=$LIB
 105 -        ], [], [-L$THIS_PREFIX/lib])
 106 +        ], [], [-L$THIS_PREFIX/lib64])
 107          if test -n "$THIS_LIBS"; then
 108            break
 109          fi
 110 @@ -170,8 +170,8 @@
 111  dnl parameters(version, library list, function)
 112  AC_DEFUN([PHP_DBA_DB_CHECK],[
 113    for LIB in $2; do
 114 -    if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
 115 -      PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[
 116 +    if test -f $THIS_PREFIX/lib64/lib$LIB.a -o -f $THIS_PREFIX/lib64/lib$LIB.$SHLIB_SUFFIX_NAME; then
 117 +      PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib64, -l$LIB,[
 118          AC_TRY_LINK([
 119  #include "$THIS_INCLUDE"
 120          ],[
 121 @@ -366,7 +366,7 @@
 122            fi
 123            AC_DEFINE(DBA_DBM, 1, [ ])
 124            THIS_LIBS=$LIB
 125 -        ], [], [-L$THIS_PREFIX/lib])
 126 +        ], [], [-L$THIS_PREFIX/lib64])
 127          if test -n "$THIS_LIBS"; then
 128            break
 129          fi
 130 @@ -408,7 +408,7 @@
 131            AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
 132            AC_DEFINE(DBA_CDB, 1, [ ])
 133            THIS_LIBS=$LIB
 134 -        ], [], [-L$THIS_PREFIX/lib])
 135 +        ], [], [-L$THIS_PREFIX/lib64])
 136          if test -n "$THIS_LIBS"; then
 137            break
 138          fi
 139 diff -burN php-5.0.4RC1.orig/ext/gd/config.m4 php-5.0.4RC1/ext/gd/config.m4
 140 --- php-5.0.4RC1.orig/ext/gd/config.m4  2005-03-15 18:21:04.469509144 +0100
 141 +++ php-5.0.4RC1/ext/gd/config.m4       2005-03-15 18:22:03.104595256 +0100
 142 @@ -51,7 +51,7 @@
 143    if test "$PHP_JPEG_DIR" != "no"; then
 144
 145      for i in $PHP_JPEG_DIR /usr/local /usr; do
 146 -      test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i && break
 147 +      test -f $i/lib64/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libjpeg.a && GD_JPEG_DIR=$i && break
 148      done
 149
 150      if test -z "$GD_JPEG_DIR"; then
 151 @@ -61,11 +61,11 @@
 152      PHP_CHECK_LIBRARY(jpeg,jpeg_read_header,
 153      [
 154        PHP_ADD_INCLUDE($GD_JPEG_DIR/include)
 155 -      PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD)
 156 +      PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib64, GD_SHARED_LIBADD)
 157      ],[
 158        AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.])
 159      ],[
 160 -      -L$GD_JPEG_DIR/lib
 161 +      -L$GD_JPEG_DIR/lib64
 162      ])
 163    else
 164      AC_MSG_RESULT([If configure fails try --with-jpeg-dir=<DIR>])
 165 @@ -76,7 +76,7 @@
 166    if test "$PHP_PNG_DIR" != "no"; then
 167
 168      for i in $PHP_PNG_DIR /usr/local /usr; do
 169 -      test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i && break
 170 +      test -f $i/lib64/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libpng.a && GD_PNG_DIR=$i && break
 171      done
 172
 173      if test -z "$GD_PNG_DIR"; then
 174 @@ -94,12 +94,12 @@
 175      PHP_CHECK_LIBRARY(png,png_write_image,
 176      [
 177        PHP_ADD_INCLUDE($GD_PNG_DIR/include)
 178 -      PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD)
 179 -      PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD)
 180 +      PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib64, GD_SHARED_LIBADD)
 181 +      PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib64, GD_SHARED_LIBADD)
 182      ],[
 183        AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.])
 184      ],[
 185 -      -L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib
 186 +      -L$PHP_ZLIB_DIR/lib64 -lz -L$GD_PNG_DIR/lib64
 187      ])
 188
 189    else
 190 @@ -111,7 +111,7 @@
 191    if test "$PHP_XPM_DIR" != "no"; then
 192
 193      for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
 194 -      test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i && break
 195 +      test -f $i/lib64/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libXpm.a && GD_XPM_DIR=$i && break
 196      done
 197
 198      if test -z "$GD_XPM_DIR"; then
 199 @@ -129,12 +129,12 @@
 200      PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage,
 201      [
 202        PHP_ADD_INCLUDE($GD_XPM_INC)
 203 -      PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD)
 204 -      PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD)
 205 +      PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib64, GD_SHARED_LIBADD)
 206 +      PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib64, GD_SHARED_LIBADD)
 207      ],[
 208        AC_MSG_ERROR([Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.])
 209      ],[
 210 -      -L$GD_XPM_DIR/lib -lX11
 211 +      -L$GD_XPM_DIR/lib64 -lX11
 212      ])
 213    else
 214      AC_MSG_RESULT(If configure fails try --with-xpm-dir=<DIR>)
 215 @@ -163,7 +163,7 @@
 216        fi
 217        if test -n "$TTF_DIR" ; then
 218          AC_DEFINE(HAVE_LIBTTF,1,[ ])
 219 -        PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib, GD_SHARED_LIBADD)
 220 +        PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib64, GD_SHARED_LIBADD)
 221        fi
 222        if test -z "$TTF_INC_DIR"; then
 223          TTF_INC_DIR=$TTF_DIR/include
 224 @@ -188,7 +188,7 @@
 225      done
 226
 227      if test -n "$FREETYPE2_DIR" ; then
 228 -      PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD)
 229 +      PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib64, GD_SHARED_LIBADD)
 230        PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
 231        PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
 232        AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
 233 @@ -216,11 +216,11 @@
 234      [
 235        AC_DEFINE(HAVE_LIBT1,1,[ ])
 236        PHP_ADD_INCLUDE($GD_T1_DIR/include)
 237 -      PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib, GD_SHARED_LIBADD)
 238 +      PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib64, GD_SHARED_LIBADD)
 239      ],[
 240        AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.])
 241      ],[
 242 -      -L$GD_T1_DIR/lib
 243 +      -L$GD_T1_DIR/lib64
 244      ])
 245    fi
 246  ])
 247 @@ -365,7 +365,7 @@
 248    done
 249
 250  dnl Library path
 251 -  for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do
 252 +  for i in lib64/gd1.3 lib64/gd lib64 gd1.3 gd ""; do
 253      test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i"
 254    done
 255
 256 diff -burN php-5.0.4RC1.orig/ext/imap/config.m4 php-5.0.4RC1/ext/imap/config.m4
 257 --- php-5.0.4RC1.orig/ext/imap/config.m4        2005-03-15 18:21:04.545497592 +0100
 258 +++ php-5.0.4RC1/ext/imap/config.m4     2005-03-15 18:22:03.105595104 +0100
 259 @@ -148,13 +148,13 @@
 260
 261      if test -r "$IMAP_DIR/c-client/c-client.a"; then
 262        ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
 263 -    elif test -r "$IMAP_DIR/lib/c-client.a"; then
 264 -      ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1
 265 +    elif test -r "$IMAP_DIR/lib64/c-client.a"; then
 266 +      ln -s "$IMAP_DIR/lib64/c-client.a" "$IMAP_DIR/lib64/libc-client.a" >/dev/null 2>&1
 267      fi
 268
 269      for lib in c-client4 c-client imap; do
 270        IMAP_LIB=$lib
 271 -      IMAP_LIB_CHK(lib)
 272 +      IMAP_LIB_CHK(lib64)
 273        IMAP_LIB_CHK(c-client)
 274      done
 275
 276 diff -burN php-5.0.4RC1.orig/ext/ldap/config.m4 php-5.0.4RC1/ext/ldap/config.m4
 277 --- php-5.0.4RC1.orig/ext/ldap/config.m4        2005-03-15 18:21:04.551496680 +0100
 278 +++ php-5.0.4RC1/ext/ldap/config.m4     2005-03-15 18:22:03.107594800 +0100
 279 @@ -6,15 +6,15 @@
 280    if test -f $1/include/ldap.h; then
 281      LDAP_DIR=$1
 282      LDAP_INCDIR=$1/include
 283 -    LDAP_LIBDIR=$1/lib
 284 +    LDAP_LIBDIR=$1/lib64
 285    elif test -f $1/include/umich-ldap/ldap.h; then
 286      LDAP_DIR=$1
 287      LDAP_INCDIR=$1/include/umich-ldap
 288 -    LDAP_LIBDIR=$1/lib
 289 +    LDAP_LIBDIR=$1/lib64
 290    elif test -f $1/ldap/public/ldap.h; then
 291      LDAP_DIR=$1
 292      LDAP_INCDIR=$1/ldap/public
 293 -    LDAP_LIBDIR=$1/lib
 294 +    LDAP_LIBDIR=$1/lib64
 295    fi
 296  ])
 297
 298 diff -burN php-5.0.4RC1.orig/ext/ming/config.m4 php-5.0.4RC1/ext/ming/config.m4
 299 --- php-5.0.4RC1.orig/ext/ming/config.m4        2005-03-15 18:21:04.555496072 +0100
 300 +++ php-5.0.4RC1/ext/ming/config.m4     2005-03-15 18:22:03.108594648 +0100
 301 @@ -9,7 +9,7 @@
 302    AC_CHECK_LIB(m, sin)
 303
 304    for i in $PHP_MING /usr/local /usr; do
 305 -    if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then
 306 +    if test -f $i/lib64/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libming.a; then
 307        MING_DIR=$i
 308        break
 309      fi
 310 @@ -34,11 +34,11 @@
 311    ],[
 312      AC_MSG_ERROR([Ming library 0.2a or greater required.])
 313    ],[
 314 -    -L$MING_DIR/lib
 315 +    -L$MING_DIR/lib64
 316    ])
 317
 318    PHP_ADD_INCLUDE($MING_INC_DIR)
 319 -  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD)
 320 +  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib64, MING_SHARED_LIBADD)
 321
 322    AC_MSG_CHECKING([for destroySWFBlock])
 323    AC_TRY_RUN([
 324 diff -burN php-5.0.4RC1.orig/ext/mssql/config.m4 php-5.0.4RC1/ext/mssql/config.m4
 325 --- php-5.0.4RC1.orig/ext/mssql/config.m4       2005-03-15 18:21:04.646482240 +0100
 326 +++ php-5.0.4RC1/ext/mssql/config.m4    2005-03-15 18:22:03.108594648 +0100
 327 @@ -32,12 +32,12 @@
 328      fi
 329    fi
 330
 331 -  if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then
 332 -     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.[a|so])
 333 +  if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.so"; then
 334 +     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libtds.[a|so])
 335    fi
 336
 337    MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include
 338 -  MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib
 339 +  MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib64
 340
 341    PHP_ADD_INCLUDE($MSSQL_INCDIR)
 342    PHP_ADD_LIBRARY_WITH_PATH(sybdb, $MSSQL_LIBDIR, MSSQL_SHARED_LIBADD)
 343 diff -burN php-5.0.4RC1.orig/ext/mysql/config.m4 php-5.0.4RC1/ext/mysql/config.m4
 344 --- php-5.0.4RC1.orig/ext/mysql/config.m4       2005-03-15 18:21:04.649481784 +0100
 345 +++ php-5.0.4RC1/ext/mysql/config.m4    2005-03-15 18:22:03.109594496 +0100
 346 @@ -17,7 +17,7 @@
 347      /var/run/mysqld/mysqld.sock \
 348      /var/tmp/mysql.sock \
 349      /var/run/mysql/mysql.sock \
 350 -    /var/lib/mysql/mysql.sock \
 351 +    /var/lib64/mysql/mysql.sock \
 352      /var/mysql/mysql.sock \
 353      /usr/local/mysql/var/mysql.sock \
 354      /Private/tmp/mysql.sock \
 355 @@ -84,7 +84,7 @@
 356  Note that the MySQL client library is not bundled anymore.])
 357    fi
 358
 359 -  for i in lib lib/mysql; do
 360 +  for i in lib64 lib64/mysql; do
 361      MYSQL_LIB_CHK($i)
 362    done
 363
 364 @@ -100,9 +100,9 @@
 365        PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [
 366          AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.])
 367        ], [
 368 -        -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR
 369 +        -L$PHP_ZLIB_DIR/lib64 -L$MYSQL_LIB_DIR
 370        ])
 371 -      MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz"
 372 +      MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib64 -lz"
 373      else
 374        PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD)
 375        PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [
 376 diff -burN php-5.0.4RC1.orig/ext/pgsql/config.m4 php-5.0.4RC1/ext/pgsql/config.m4
 377 --- php-5.0.4RC1.orig/ext/pgsql/config.m4       2005-03-15 18:21:04.658480416 +0100
 378 +++ php-5.0.4RC1/ext/pgsql/config.m4    2005-03-15 18:22:03.109594496 +0100
 379 @@ -44,7 +44,7 @@
 380          fi
 381        done
 382
 383 -      for j in lib lib/pgsql lib/postgres lib/postgresql ""; do
 384 +      for j in lib64 lib64/pgsql lib64/postgres lib64/postgresql ""; do
 385          if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
 386            PGSQL_LIBDIR=$i/$j
 387          fi
 388 diff -burN php-5.0.4RC1.orig/ext/xml/config.m4 php-5.0.4RC1/ext/xml/config.m4
 389 --- php-5.0.4RC1.orig/ext/xml/config.m4 2005-03-15 18:21:04.530499872 +0100
 390 +++ php-5.0.4RC1/ext/xml/config.m4      2005-03-15 18:22:03.110594344 +0100
 391 @@ -30,7 +30,7 @@
 392    dnl
 393    if test "$PHP_LIBEXPAT_DIR" != "no"; then
 394      for i in $PHP_XML $PHP_LIBEXPAT_DIR; do
 395 -      if test -f "$i/lib/libexpat.a" -o -f "$i/lib/libexpat.$SHLIB_SUFFIX_NAME"; then
 396 +      if test -f "$i/lib64/libexpat.a" -o -f "$i/lib64/libexpat.$SHLIB_SUFFIX_NAME"; then
 397          EXPAT_DIR=$i
 398          break
 399        fi
 400 @@ -41,7 +41,7 @@
 401      fi
 402
 403      PHP_ADD_INCLUDE($EXPAT_DIR/include)
 404 -    PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD)
 405 +    PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib64, XML_SHARED_LIBADD)
 406      AC_DEFINE(HAVE_LIBEXPAT, 1, [ ])
 407    fi
 408
 409 diff -burN php-5.0.4RC1.orig/ext/xmlrpc/config.m4 php-5.0.4RC1/ext/xmlrpc/config.m4
 410 --- php-5.0.4RC1.orig/ext/xmlrpc/config.m4      2005-03-15 18:21:04.902443328 +0100
 411 +++ php-5.0.4RC1/ext/xmlrpc/config.m4   2005-03-15 18:22:03.110594344 +0100
 412 @@ -23,9 +23,9 @@
 413
 414    testval=no
 415    for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
 416 -    if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
 417 +    if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then
 418        AC_DEFINE(HAVE_LIBEXPAT2,1,[ ])
 419 -      PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD)
 420 +      PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XMLRPC_SHARED_LIBADD)
 421        PHP_ADD_INCLUDE($i/include)
 422        testval=yes
 423        break
 424 @@ -90,6 +90,6 @@
 425    PHP_NEW_EXTENSION(xmlrpc,xmlrpc-epi-php.c,$ext_shared)
 426    XMLRPC_MODULE_TYPE=external
 427    PHP_ADD_INCLUDE($XMLRPC_DIR)
 428 -  PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD)
 429 +  PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib64, XMLRPC_SHARED_LIBADD)
 430  fi
 431
 432 diff -burN php-5.0.4RC1.orig/php.ini php-5.0.4RC1/php.ini
 433 --- php-5.0.4RC1.orig/php.ini   2005-03-15 18:21:05.162403808 +0100
 434 +++ php-5.0.4RC1/php.ini        2005-03-15 18:22:03.111594192 +0100
 435 @@ -514,7 +514,7 @@
 436  user_dir =
 437
 438  ; Directory in which the loadable extensions (modules) reside.
 439 -extension_dir = "/usr/lib/php"
 440 +extension_dir = "/usr/lib64/php"
 441
 442  ; Whether or not to enable the dl() function.  The dl() function does NOT work
 443  ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
 444 diff -burN php-5.0.4RC1.orig/scripts/Makefile.frag php-5.0.4RC1/scripts/Makefile.frag
 445 --- php-5.0.4RC1.orig/scripts/Makefile.frag     2005-03-15 18:21:05.145406392 +0100
 446 +++ php-5.0.4RC1/scripts/Makefile.frag  2005-03-15 18:22:03.112594040 +0100
 447 @@ -4,7 +4,7 @@
 448  #
 449
 450  phpincludedir = $(includedir)/php
 451 -phpbuilddir = $(prefix)/lib/php/build
 452 +phpbuilddir = $(libdir)/php/build
 453
 454  BUILD_FILES = \
 455         scripts/phpize.m4 \