php-lib64.patch

   1 diff -urN php-5.0.0.org/acinclude.m4 php-5.0.0/acinclude.m4
   2 --- php-5.0.0.org/acinclude.m4  2004-08-04 15:01:43.643552344 +0200
   3 +++ php-5.0.0/acinclude.m4      2004-08-04 15:01:59.341165944 +0200
   4 @@ -1625,6 +1625,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 -urN php-5.0.0.org/ext/cpdf/config.m4 php-5.0.0/ext/cpdf/config.m4
  15 --- php-5.0.0.org/ext/cpdf/config.m4    2004-08-04 15:01:42.782683216 +0200
  16 +++ php-5.0.0/ext/cpdf/config.m4        2004-08-04 15:04:14.265654304 +0200
  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 @@ -59,12 +59,12 @@
  64
  65        PHP_CHECK_LIBRARY(cpdf, cpdf_open, [
  66          PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
  67 -        PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib, CPDF_SHARED_LIBADD)
  68 +        PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib64, CPDF_SHARED_LIBADD)
  69          AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])
  70        ], [
  71          AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
  72        ], [
  73 -        -L$i/lib $CPDF_SHARED_LIBADD
  74 +        -L$i/lib64 $CPDF_SHARED_LIBADD
  75        ])
  76        break
  77      fi
  78 diff -urN php-5.0.0.org/ext/dba/config.m4 php-5.0.0/ext/dba/config.m4
  79 --- php-5.0.0.org/ext/dba/config.m4     2004-08-04 15:01:42.730691120 +0200
  80 +++ php-5.0.0/ext/dba/config.m4 2004-08-04 15:01:59.343165640 +0200
  81 @@ -18,7 +18,7 @@
  82  dnl Assign INCLUDE/LFLAGS from PREFIX
  83  AC_DEFUN(PHP_DBA_STD_ASSIGN,[
  84    if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
  85 -    THIS_LFLAGS=$THIS_PREFIX/lib
  86 +    THIS_LFLAGS=$THIS_PREFIX/lib64
  87    fi
  88  ])
  89
  90 @@ -118,7 +118,7 @@
  91          AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
  92          AC_DEFINE(DBA_GDBM, 1, [ ])
  93          THIS_LIBS=gdbm
  94 -      ], [], [-L$THIS_PREFIX/lib])
  95 +      ], [], [-L$THIS_PREFIX/lib64])
  96      fi
  97
  98      PHP_DBA_STD_ASSIGN
  99 @@ -150,7 +150,7 @@
 100            AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
 101            AC_DEFINE(DBA_NDBM, 1, [ ])
 102            THIS_LIBS=$LIB
 103 -        ], [], [-L$THIS_PREFIX/lib])
 104 +        ], [], [-L$THIS_PREFIX/lib64])
 105          if test -n "$THIS_LIBS"; then
 106            break
 107          fi
 108 @@ -168,8 +168,8 @@
 109  dnl parameters(version, library list, function)
 110  AC_DEFUN(PHP_DBA_DB_CHECK,[
 111    for LIB in $2; do
 112 -    if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
 113 -      PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib -l$LIB,[
 114 +    if test -f $THIS_PREFIX/lib64/lib$LIB.a -o -f $THIS_PREFIX/lib64/lib$LIB.$SHLIB_SUFFIX_NAME; then
 115 +      PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib64 -l$LIB,[
 116          AC_TRY_LINK([
 117  #include "$THIS_INCLUDE"
 118          ],[
 119 @@ -364,7 +364,7 @@
 120            fi
 121            AC_DEFINE(DBA_DBM, 1, [ ])
 122            THIS_LIBS=$LIB
 123 -        ], [], [-L$THIS_PREFIX/lib])
 124 +        ], [], [-L$THIS_PREFIX/lib64])
 125          if test -n "$THIS_LIBS"; then
 126            break
 127          fi
 128 @@ -406,7 +406,7 @@
 129            AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
 130            AC_DEFINE(DBA_CDB, 1, [ ])
 131            THIS_LIBS=$LIB
 132 -        ], [], [-L$THIS_PREFIX/lib])
 133 +        ], [], [-L$THIS_PREFIX/lib64])
 134          if test -n "$THIS_LIBS"; then
 135            break
 136          fi
 137 diff -urN php-5.0.0.org/ext/gd/config.m4 php-5.0.0/ext/gd/config.m4
 138 --- php-5.0.0.org/ext/gd/config.m4      2004-08-04 15:01:42.698695984 +0200
 139 +++ php-5.0.0/ext/gd/config.m4  2004-08-04 15:01:59.344165488 +0200
 140 @@ -51,7 +51,7 @@
 141    if test "$PHP_JPEG_DIR" != "no"; then
 142
 143      for i in $PHP_JPEG_DIR /usr/local /usr; do
 144 -      test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i && break
 145 +      test -f $i/lib64/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libjpeg.a && GD_JPEG_DIR=$i && break
 146      done
 147
 148      if test -z "$GD_JPEG_DIR"; then
 149 @@ -61,11 +61,11 @@
 150      PHP_CHECK_LIBRARY(jpeg,jpeg_read_header,
 151      [
 152        PHP_ADD_INCLUDE($GD_JPEG_DIR/include)
 153 -      PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD)
 154 +      PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib64, GD_SHARED_LIBADD)
 155      ],[
 156        AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.])
 157      ],[
 158 -      -L$GD_JPEG_DIR/lib
 159 +      -L$GD_JPEG_DIR/lib64
 160      ])
 161    else
 162      AC_MSG_RESULT([If configure fails try --with-jpeg-dir=<DIR>])
 163 @@ -76,7 +76,7 @@
 164    if test "$PHP_PNG_DIR" != "no"; then
 165
 166      for i in $PHP_PNG_DIR /usr/local /usr; do
 167 -      test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i && break
 168 +      test -f $i/lib64/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libpng.a && GD_PNG_DIR=$i && break
 169      done
 170
 171      if test -z "$GD_PNG_DIR"; then
 172 @@ -94,12 +94,12 @@
 173      PHP_CHECK_LIBRARY(png,png_write_image,
 174      [
 175        PHP_ADD_INCLUDE($GD_PNG_DIR/include)
 176 -      PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD)
 177 -      PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD)
 178 +      PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib64, GD_SHARED_LIBADD)
 179 +      PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib64, GD_SHARED_LIBADD)
 180      ],[
 181        AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.])
 182      ],[
 183 -      -L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib
 184 +      -L$PHP_ZLIB_DIR/lib64 -lz -L$GD_PNG_DIR/lib64
 185      ])
 186
 187    else
 188 @@ -111,7 +111,7 @@
 189    if test "$PHP_XPM_DIR" != "no"; then
 190
 191      for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
 192 -      test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i && break
 193 +      test -f $i/lib64/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libXpm.a && GD_XPM_DIR=$i && break
 194      done
 195
 196      if test -z "$GD_XPM_DIR"; then
 197 @@ -129,12 +129,12 @@
 198      PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage,
 199      [
 200        PHP_ADD_INCLUDE($GD_XPM_INC)
 201 -      PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD)
 202 -      PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD)
 203 +      PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib64, GD_SHARED_LIBADD)
 204 +      PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib64, GD_SHARED_LIBADD)
 205      ],[
 206        AC_MSG_ERROR([Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.])
 207      ],[
 208 -      -L$GD_XPM_DIR/lib -lX11
 209 +      -L$GD_XPM_DIR/lib64 -lX11
 210      ])
 211    else
 212      AC_MSG_RESULT(If configure fails try --with-xpm-dir=<DIR>)
 213 @@ -163,7 +163,7 @@
 214        fi
 215        if test -n "$TTF_DIR" ; then
 216          AC_DEFINE(HAVE_LIBTTF,1,[ ])
 217 -        PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib, GD_SHARED_LIBADD)
 218 +        PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib64, GD_SHARED_LIBADD)
 219        fi
 220        if test -z "$TTF_INC_DIR"; then
 221          TTF_INC_DIR=$TTF_DIR/include
 222 @@ -188,7 +188,7 @@
 223      done
 224
 225      if test -n "$FREETYPE2_DIR" ; then
 226 -      PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD)
 227 +      PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib64, GD_SHARED_LIBADD)
 228        PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
 229        PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
 230        AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
 231 @@ -216,11 +216,11 @@
 232      [
 233        AC_DEFINE(HAVE_LIBT1,1,[ ])
 234        PHP_ADD_INCLUDE($GD_T1_DIR/include)
 235 -      PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib, GD_SHARED_LIBADD)
 236 +      PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib64, GD_SHARED_LIBADD)
 237      ],[
 238        AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.])
 239      ],[
 240 -      -L$GD_T1_DIR/lib
 241 +      -L$GD_T1_DIR/lib64
 242      ])
 243    fi
 244  ])
 245 @@ -360,7 +360,7 @@
 246    done
 247
 248  dnl Library path
 249 -  for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do
 250 +  for i in lib64/gd1.3 lib64/gd lib64 gd1.3 gd ""; do
 251      test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i"
 252    done
 253
 254 diff -urN php-5.0.0.org/ext/imap/config.m4 php-5.0.0/ext/imap/config.m4
 255 --- php-5.0.0.org/ext/imap/config.m4    2004-08-04 15:01:42.787682456 +0200
 256 +++ php-5.0.0/ext/imap/config.m4        2004-08-04 15:01:59.345165336 +0200
 257 @@ -59,7 +59,7 @@
 258      fi
 259
 260      for i in $SEARCH_PATHS; do
 261 -      if test -f $i/lib/libkrb5.a || test -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME; then
 262 +      if test -f $i/lib64/libkrb5.a || test -f $i/lib64/libkrb5.$SHLIB_SUFFIX_NAME; then
 263          PHP_KERBEROS_DIR=$i
 264          break
 265        fi
 266 @@ -72,7 +72,7 @@
 267        ])
 268      fi
 269      AC_DEFINE(HAVE_IMAP_KRB,1,[ ])
 270 -    PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, IMAP_SHARED_LIBADD)
 271 +    PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib64, IMAP_SHARED_LIBADD)
 272      PHP_ADD_LIBRARY(gssapi_krb5, 1, IMAP_SHARED_LIBADD)
 273      PHP_ADD_LIBRARY(krb5, 1, IMAP_SHARED_LIBADD)
 274      PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD)
 275 @@ -104,11 +104,11 @@
 276    AC_MSG_CHECKING([whether SSL libraries are needed for c-client])
 277
 278    if test "$PHP_IMAP_SSL" != "no"; then
 279 -    AC_MSG_RESULT([$PHP_IMAP_SSL/lib])
 280 +    AC_MSG_RESULT([$PHP_IMAP_SSL/lib64])
 281      AC_DEFINE(HAVE_IMAP_SSL,1,[ ])
 282      PHP_ADD_LIBRARY_DEFER(ssl,    1, IMAP_SHARED_LIBADD)
 283      PHP_ADD_LIBRARY_DEFER(crypto, 1, IMAP_SHARED_LIBADD)
 284 -    PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
 285 +    PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib64, IMAP_SHARED_LIBADD)
 286    else
 287      AC_MSG_RESULT(no)
 288    fi
 289 @@ -166,13 +166,13 @@
 290
 291      if test -r "$IMAP_DIR/c-client/c-client.a"; then
 292        ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
 293 -    elif test -r "$IMAP_DIR/lib/c-client.a"; then
 294 -      ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1
 295 +    elif test -r "$IMAP_DIR/lib64/c-client.a"; then
 296 +      ln -s "$IMAP_DIR/lib64/c-client.a" "$IMAP_DIR/lib64/libc-client.a" >/dev/null 2>&1
 297      fi
 298
 299      for lib in c-client4 c-client imap; do
 300        IMAP_LIB=$lib
 301 -      IMAP_LIB_CHK(lib)
 302 +      IMAP_LIB_CHK(lib64)
 303        IMAP_LIB_CHK(c-client)
 304      done
 305
 306 diff -urN php-5.0.0.org/ext/ldap/config.m4 php-5.0.0/ext/ldap/config.m4
 307 --- php-5.0.0.org/ext/ldap/config.m4    2004-08-04 15:01:42.791681848 +0200
 308 +++ php-5.0.0/ext/ldap/config.m4        2004-08-04 15:01:59.345165336 +0200
 309 @@ -6,15 +6,15 @@
 310    if test -f $1/include/ldap.h; then
 311      LDAP_DIR=$1
 312      LDAP_INCDIR=$1/include
 313 -    LDAP_LIBDIR=$1/lib
 314 +    LDAP_LIBDIR=$1/lib64
 315    elif test -f $1/include/umich-ldap/ldap.h; then
 316      LDAP_DIR=$1
 317      LDAP_INCDIR=$1/include/umich-ldap
 318 -    LDAP_LIBDIR=$1/lib
 319 +    LDAP_LIBDIR=$1/lib64
 320    elif test -f $1/ldap/public/ldap.h; then
 321      LDAP_DIR=$1
 322      LDAP_INCDIR=$1/ldap/public
 323 -    LDAP_LIBDIR=$1/lib
 324 +    LDAP_LIBDIR=$1/lib64
 325    fi
 326  ])
 327
 328 diff -urN php-5.0.0.org/ext/ming/config.m4 php-5.0.0/ext/ming/config.m4
 329 --- php-5.0.0.org/ext/ming/config.m4    2004-08-04 15:01:42.793681544 +0200
 330 +++ php-5.0.0/ext/ming/config.m4        2004-08-04 15:01:59.346165184 +0200
 331 @@ -9,7 +9,7 @@
 332    AC_CHECK_LIB(m, sin)
 333
 334    for i in $PHP_MING /usr/local /usr; do
 335 -    if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then
 336 +    if test -f $i/lib64/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libming.a; then
 337        MING_DIR=$i
 338      fi
 339    done
 340 @@ -33,11 +33,11 @@
 341    ],[
 342      AC_MSG_ERROR([Ming library 0.2a or greater required.])
 343    ],[
 344 -    -L$MING_DIR/lib
 345 +    -L$MING_DIR/lib64
 346    ])
 347
 348    PHP_ADD_INCLUDE($MING_INC_DIR)
 349 -  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD)
 350 +  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib64, MING_SHARED_LIBADD)
 351
 352    AC_MSG_CHECKING([for destroySWFBlock])
 353    AC_TRY_RUN([
 354 diff -urN php-5.0.0.org/ext/mssql/config.m4 php-5.0.0/ext/mssql/config.m4
 355 --- php-5.0.0.org/ext/mssql/config.m4   2004-08-04 15:01:42.850672880 +0200
 356 +++ php-5.0.0/ext/mssql/config.m4       2004-08-04 15:01:59.346165184 +0200
 357 @@ -32,12 +32,12 @@
 358      fi
 359    fi
 360
 361 -  if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then
 362 -     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.so)
 363 +  if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.so"; then
 364 +     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libtds.so)
 365    fi
 366
 367    MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include
 368 -  MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib
 369 +  MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib64
 370
 371    PHP_ADD_INCLUDE($MSSQL_INCDIR)
 372    PHP_ADD_LIBRARY_WITH_PATH(sybdb, $MSSQL_LIBDIR, MSSQL_SHARED_LIBADD)
 373 diff -urN php-5.0.0.org/ext/mysql/config.m4 php-5.0.0/ext/mysql/config.m4
 374 --- php-5.0.0.org/ext/mysql/config.m4   2004-08-04 15:01:42.851672728 +0200
 375 +++ php-5.0.0/ext/mysql/config.m4       2004-08-04 15:01:59.347165032 +0200
 376 @@ -17,7 +17,7 @@
 377      /var/run/mysqld/mysqld.sock \
 378      /var/tmp/mysql.sock \
 379      /var/run/mysql/mysql.sock \
 380 -    /var/lib/mysql/mysql.sock \
 381 +    /var/lib64/mysql/mysql.sock \
 382      /var/mysql/mysql.sock \
 383      /usr/local/mysql/var/mysql.sock \
 384      /Private/tmp/mysql.sock \
 385 @@ -84,7 +84,7 @@
 386  Note that the MySQL client library is not bundled anymore.])
 387    fi
 388
 389 -  for i in lib lib/mysql; do
 390 +  for i in lib64 lib64/mysql; do
 391      MYSQL_LIB_CHK($i)
 392    done
 393
 394 @@ -100,9 +100,9 @@
 395        PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [
 396          AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.])
 397        ], [
 398 -        -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR
 399 +        -L$PHP_ZLIB_DIR/lib64 -L$MYSQL_LIB_DIR
 400        ])
 401 -      MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz"
 402 +      MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib64 -lz"
 403      else
 404        PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD)
 405        PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [
 406 diff -urN php-5.0.0.org/ext/pgsql/config.m4 php-5.0.0/ext/pgsql/config.m4
 407 --- php-5.0.0.org/ext/pgsql/config.m4   2004-08-04 15:01:42.857671816 +0200
 408 +++ php-5.0.0/ext/pgsql/config.m4       2004-08-04 15:09:33.020196248 +0200
 409 @@ -44,7 +44,7 @@
 410          fi
 411        done
 412
 413 -      for j in lib lib/pgsql lib/postgres lib/postgresql ""; do
 414 +      for j in lib64 lib64/pgsql lib64/postgres lib64/postgresql ""; do
 415          if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
 416            PGSQL_LIBDIR=$i/$j
 417          fi
 418 diff -urN php-5.0.0.org/ext/xml/config.m4 php-5.0.0/ext/xml/config.m4
 419 --- php-5.0.0.org/ext/xml/config.m4     2004-08-04 15:01:42.778683824 +0200
 420 +++ php-5.0.0/ext/xml/config.m4 2004-08-04 15:08:03.649782616 +0200
 421 @@ -30,7 +30,7 @@
 422    dnl
 423    if test "$PHP_LIBEXPAT_DIR" != "no"; then
 424      for i in $PHP_XML $PHP_LIBEXPAT_DIR; do
 425 -      if test -f "$i/lib/libexpat.a" -o -f "$i/lib/libexpat.$SHLIB_SUFFIX_NAME"; then
 426 +      if test -f "$i/lib64/libexpat.a" -o -f "$i/lib64/libexpat.$SHLIB_SUFFIX_NAME"; then
 427          EXPAT_DIR=$i
 428          break
 429        fi
 430 @@ -41,7 +41,7 @@
 431      fi
 432
 433      PHP_ADD_INCLUDE($EXPAT_DIR/include)
 434 -    PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD)
 435 +    PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib64, XML_SHARED_LIBADD)
 436      AC_DEFINE(HAVE_LIBEXPAT, 1, [ ])
 437    fi
 438
 439 diff -urN php-5.0.0.org/ext/xmlrpc/config.m4 php-5.0.0/ext/xmlrpc/config.m4
 440 --- php-5.0.0.org/ext/xmlrpc/config.m4  2004-08-04 15:01:43.127630776 +0200
 441 +++ php-5.0.0/ext/xmlrpc/config.m4      2004-08-04 15:01:59.350164576 +0200
 442 @@ -23,9 +23,9 @@
 443
 444    testval=no
 445    for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
 446 -    if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
 447 +    if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then
 448        AC_DEFINE(HAVE_LIBEXPAT2,1,[ ])
 449 -      PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD)
 450 +      PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XMLRPC_SHARED_LIBADD)
 451        PHP_ADD_INCLUDE($i/include)
 452        testval=yes
 453        break
 454 @@ -90,6 +90,6 @@
 455    PHP_NEW_EXTENSION(xmlrpc,xmlrpc-epi-php.c,$ext_shared)
 456    XMLRPC_MODULE_TYPE=external
 457    PHP_ADD_INCLUDE($XMLRPC_DIR)
 458 -  PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD)
 459 +  PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib64, XMLRPC_SHARED_LIBADD)
 460  fi
 461
 462 diff -urN php-5.0.0.org/scripts/Makefile.frag php-5.0.0/scripts/Makefile.frag
 463 --- php-5.0.0.org/scripts/Makefile.frag 2004-08-04 15:01:43.632554016 +0200
 464 +++ php-5.0.0/scripts/Makefile.frag     2004-08-04 15:37:06.942761800 +0200
 465 @@ -4,7 +4,7 @@
 466  #
 467
 468  phpincludedir = $(includedir)/php
 469 -phpbuilddir = $(prefix)/lib/php/build
 470 +phpbuilddir = $(libdir)/php/build
 471
 472  BUILD_FILES = \
 473         scripts/phpize.m4 \