php4-lib64.patch

   1 diff -burN php-4.3.9RC2.orig/acinclude.m4 php-4.3.9RC2/acinclude.m4
   2 --- php-4.3.9RC2.orig/acinclude.m4      2004-09-04 13:19:39.000000000 +0200
   3 +++ php-4.3.9RC2/acinclude.m4   2004-09-04 14:24:43.730950352 +0200
   4 @@ -1629,6 +1629,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-4.3.9RC2.orig/ext/cpdf/config.m4 php-4.3.9RC2/ext/cpdf/config.m4
  15 --- php-4.3.9RC2.orig/ext/cpdf/config.m4        2004-09-04 13:19:30.000000000 +0200
  16 +++ php-4.3.9RC2/ext/cpdf/config.m4     2004-09-04 14:24:43.732950048 +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 @@ -14,11 +14,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 @@ -27,7 +27,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 @@ -37,11 +37,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 @@ -66,12 +66,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 -burN php-4.3.9RC2.orig/ext/crack/config.m4 php-4.3.9RC2/ext/crack/config.m4
  79 --- php-4.3.9RC2.orig/ext/crack/config.m4       2004-09-04 13:19:32.000000000 +0200
  80 +++ php-4.3.9RC2/ext/crack/config.m4    2004-09-04 14:24:43.735949592 +0200
  81 @@ -7,7 +7,7 @@
  82
  83  if test "$PHP_CRACK" != "no"; then
  84
  85 -  for i in $PHP_CRACK/lib $PHP_CRACK/cracklib /usr/local/lib /usr/lib; do
  86 +  for i in $PHP_CRACK/lib64 $PHP_CRACK/cracklib /usr/local/lib64 /usr/lib64; do
  87      test -f $i/libcrack.$SHLIB_SUFFIX_NAME -o -f $i/libcrack.a && CRACK_LIBDIR=$i && break
  88    done
  89
  90 diff -burN php-4.3.9RC2.orig/ext/dba/config.m4 php-4.3.9RC2/ext/dba/config.m4
  91 --- php-4.3.9RC2.orig/ext/dba/config.m4 2004-09-04 13:19:30.000000000 +0200
  92 +++ php-4.3.9RC2/ext/dba/config.m4      2004-09-04 14:24:43.737949288 +0200
  93 @@ -18,7 +18,7 @@
  94  dnl Assign INCLUDE/LFLAGS from PREFIX
  95  AC_DEFUN(PHP_DBA_STD_ASSIGN,[
  96    if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
  97 -    THIS_LFLAGS=$THIS_PREFIX/lib
  98 +    THIS_LFLAGS=$THIS_PREFIX/lib64
  99    fi
 100  ])
 101
 102 @@ -83,7 +83,7 @@
 103          AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
 104          AC_DEFINE(DBA_GDBM, 1, [ ])
 105          THIS_LIBS=gdbm
 106 -      ], [], [-L$THIS_PREFIX/lib])
 107 +      ], [], [-L$THIS_PREFIX/lib64])
 108      fi
 109
 110      PHP_DBA_STD_ASSIGN
 111 @@ -115,7 +115,7 @@
 112            AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
 113            AC_DEFINE(DBA_NDBM, 1, [ ])
 114            THIS_LIBS=$LIB
 115 -        ], [], [-L$THIS_PREFIX/lib])
 116 +        ], [], [-L$THIS_PREFIX/lib64])
 117          if test -n "$THIS_LIBS"; then
 118            break
 119          fi
 120 @@ -133,8 +133,8 @@
 121  dnl parameters(version, library list, function)
 122  AC_DEFUN(PHP_DBA_DB_CHECK,[
 123    for LIB in $2; do
 124 -    if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
 125 -      PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib -l$LIB,[
 126 +    if test -f $THIS_PREFIX/lib64/lib$LIB.a -o -f $THIS_PREFIX/lib64/lib$LIB.$SHLIB_SUFFIX_NAME; then
 127 +      PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib64 -l$LIB,[
 128          AC_TRY_LINK([
 129  #include "$THIS_INCLUDE"
 130          ],[
 131 @@ -326,7 +326,7 @@
 132            fi
 133            AC_DEFINE(DBA_DBM, 1, [ ])
 134            THIS_LIBS=$LIB
 135 -        ], [], [-L$THIS_PREFIX/lib])
 136 +        ], [], [-L$THIS_PREFIX/lib64])
 137          if test -n "$THIS_LIBS"; then
 138            break
 139          fi
 140 @@ -368,7 +368,7 @@
 141            AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
 142            AC_DEFINE(DBA_CDB, 1, [ ])
 143            THIS_LIBS=$LIB
 144 -        ], [], [-L$THIS_PREFIX/lib])
 145 +        ], [], [-L$THIS_PREFIX/lib64])
 146          if test -n "$THIS_LIBS"; then
 147            break
 148          fi
 149 diff -burN php-4.3.9RC2.orig/ext/gd/config.m4 php-4.3.9RC2/ext/gd/config.m4
 150 --- php-4.3.9RC2.orig/ext/gd/config.m4  2004-09-04 13:19:30.000000000 +0200
 151 +++ php-4.3.9RC2/ext/gd/config.m4       2004-09-04 14:24:43.740948832 +0200
 152 @@ -51,7 +51,7 @@
 153    if test "$PHP_JPEG_DIR" != "no"; then
 154
 155      for i in $PHP_JPEG_DIR /usr/local /usr; do
 156 -      test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i && break
 157 +      test -f $i/lib64/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libjpeg.a && GD_JPEG_DIR=$i && break
 158      done
 159
 160      if test -z "$GD_JPEG_DIR"; then
 161 @@ -61,11 +61,11 @@
 162      PHP_CHECK_LIBRARY(jpeg,jpeg_read_header,
 163      [
 164        PHP_ADD_INCLUDE($GD_JPEG_DIR/include)
 165 -      PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD)
 166 +      PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib64, GD_SHARED_LIBADD)
 167      ],[
 168        AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.])
 169      ],[
 170 -      -L$GD_JPEG_DIR/lib
 171 +      -L$GD_JPEG_DIR/lib64
 172      ])
 173    else
 174      AC_MSG_RESULT([If configure fails try --with-jpeg-dir=<DIR>])
 175 @@ -76,7 +76,7 @@
 176    if test "$PHP_PNG_DIR" != "no"; then
 177
 178      for i in $PHP_PNG_DIR /usr/local /usr; do
 179 -      test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i && break
 180 +      test -f $i/lib64/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libpng.a && GD_PNG_DIR=$i && break
 181      done
 182
 183      if test -z "$GD_PNG_DIR"; then
 184 @@ -94,12 +94,12 @@
 185      PHP_CHECK_LIBRARY(png,png_write_image,
 186      [
 187        PHP_ADD_INCLUDE($GD_PNG_DIR/include)
 188 -      PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD)
 189 -      PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD)
 190 +      PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib64, GD_SHARED_LIBADD)
 191 +      PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib64, GD_SHARED_LIBADD)
 192      ],[
 193        AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.])
 194      ],[
 195 -      -L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib
 196 +      -L$PHP_ZLIB_DIR/lib64 -lz -L$GD_PNG_DIR/lib64
 197      ])
 198
 199    else
 200 @@ -111,7 +111,7 @@
 201    if test "$PHP_XPM_DIR" != "no"; then
 202
 203      for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
 204 -      test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i && break
 205 +      test -f $i/lib64/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libXpm.a && GD_XPM_DIR=$i && break
 206      done
 207
 208      if test -z "$GD_XPM_DIR"; then
 209 @@ -129,12 +129,12 @@
 210      PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage,
 211      [
 212        PHP_ADD_INCLUDE($GD_XPM_INC)
 213 -      PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD)
 214 -      PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD)
 215 +      PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib64, GD_SHARED_LIBADD)
 216 +      PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib64, GD_SHARED_LIBADD)
 217      ],[
 218        AC_MSG_ERROR([Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.])
 219      ],[
 220 -      -L$GD_XPM_DIR/lib -lX11
 221 +      -L$GD_XPM_DIR/lib64 -lX11
 222      ])
 223    else
 224      AC_MSG_RESULT(If configure fails try --with-xpm-dir=<DIR>)
 225 @@ -163,7 +163,7 @@
 226        fi
 227        if test -n "$TTF_DIR" ; then
 228          AC_DEFINE(HAVE_LIBTTF,1,[ ])
 229 -        PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib, GD_SHARED_LIBADD)
 230 +        PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib64, GD_SHARED_LIBADD)
 231        fi
 232        if test -z "$TTF_INC_DIR"; then
 233          TTF_INC_DIR=$TTF_DIR/include
 234 @@ -187,7 +187,7 @@
 235      done
 236
 237      if test -n "$FREETYPE2_DIR" ; then
 238 -      PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD)
 239 +      PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib64, GD_SHARED_LIBADD)
 240        PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
 241        PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
 242        AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
 243 @@ -215,11 +215,11 @@
 244      [
 245        AC_DEFINE(HAVE_LIBT1,1,[ ])
 246        PHP_ADD_INCLUDE($GD_T1_DIR/include)
 247 -      PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib, GD_SHARED_LIBADD)
 248 +      PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib64, GD_SHARED_LIBADD)
 249      ],[
 250        AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.])
 251      ],[
 252 -      -L$GD_T1_DIR/lib
 253 +      -L$GD_T1_DIR/lib64
 254      ])
 255    fi
 256  ])
 257 @@ -362,7 +362,7 @@
 258    done
 259
 260  dnl Library path
 261 -  for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do
 262 +  for i in lib64/gd1.3 lib64/gd lib64 gd1.3 gd ""; do
 263      test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i"
 264    done
 265
 266 diff -burN php-4.3.9RC2.orig/ext/imap/config.m4 php-4.3.9RC2/ext/imap/config.m4
 267 --- php-4.3.9RC2.orig/ext/imap/config.m4        2004-09-04 13:19:31.000000000 +0200
 268 +++ php-4.3.9RC2/ext/imap/config.m4     2004-09-04 14:24:43.764945184 +0200
 269 @@ -71,7 +71,7 @@
 270      fi
 271
 272      for i in $SEARCH_PATHS; do
 273 -      if test -f $i/lib/libkrb5.a || test -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME; then
 274 +      if test -f $i/lib64/libkrb5.a || test -f $i/lib64/libkrb5.$SHLIB_SUFFIX_NAME; then
 275          PHP_KERBEROS_DIR=$i
 276          break
 277        fi
 278 @@ -84,7 +84,7 @@
 279        ])
 280      fi
 281      AC_DEFINE(HAVE_IMAP_KRB,1,[ ])
 282 -    PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, IMAP_SHARED_LIBADD)
 283 +    PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib64, IMAP_SHARED_LIBADD)
 284      PHP_ADD_LIBRARY(gssapi_krb5, 1, IMAP_SHARED_LIBADD)
 285      PHP_ADD_LIBRARY(krb5, 1, IMAP_SHARED_LIBADD)
 286      PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD)
 287 @@ -116,11 +116,11 @@
 288    AC_MSG_CHECKING([whether SSL libraries are needed for c-client])
 289
 290    if test "$PHP_IMAP_SSL" != "no"; then
 291 -    AC_MSG_RESULT([$PHP_IMAP_SSL/lib])
 292 +    AC_MSG_RESULT([$PHP_IMAP_SSL/lib64])
 293      AC_DEFINE(HAVE_IMAP_SSL,1,[ ])
 294      PHP_ADD_LIBRARY_DEFER(ssl,    1, IMAP_SHARED_LIBADD)
 295      PHP_ADD_LIBRARY_DEFER(crypto, 1, IMAP_SHARED_LIBADD)
 296 -    PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
 297 +    PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib64, IMAP_SHARED_LIBADD)
 298    else
 299      AC_MSG_RESULT(no)
 300    fi
 301 @@ -178,13 +178,13 @@
 302
 303      if test -r "$IMAP_DIR/c-client/c-client.a"; then
 304        ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
 305 -    elif test -r "$IMAP_DIR/lib/c-client.a"; then
 306 -      ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1
 307 +    elif test -r "$IMAP_DIR/lib64/c-client.a"; then
 308 +      ln -s "$IMAP_DIR/lib64/c-client.a" "$IMAP_DIR/lib64/libc-client.a" >/dev/null 2>&1
 309      fi
 310
 311      for lib in c-client4 c-client imap; do
 312        IMAP_LIB=$lib
 313 -      IMAP_LIB_CHK(lib)
 314 +      IMAP_LIB_CHK(lib64)
 315        IMAP_LIB_CHK(c-client)
 316      done
 317
 318 diff -burN php-4.3.9RC2.orig/ext/ldap/config.m4 php-4.3.9RC2/ext/ldap/config.m4
 319 --- php-4.3.9RC2.orig/ext/ldap/config.m4        2004-09-04 13:19:31.000000000 +0200
 320 +++ php-4.3.9RC2/ext/ldap/config.m4     2004-09-04 14:24:43.786941840 +0200
 321 @@ -6,15 +6,15 @@
 322    if test -f $1/include/ldap.h; then
 323      LDAP_DIR=$1
 324      LDAP_INCDIR=$1/include
 325 -    LDAP_LIBDIR=$1/lib
 326 +    LDAP_LIBDIR=$1/lib64
 327    elif test -f $1/include/umich-ldap/ldap.h; then
 328      LDAP_DIR=$1
 329      LDAP_INCDIR=$1/include/umich-ldap
 330 -    LDAP_LIBDIR=$1/lib
 331 +    LDAP_LIBDIR=$1/lib64
 332    elif test -f $1/ldap/public/ldap.h; then
 333      LDAP_DIR=$1
 334      LDAP_INCDIR=$1/ldap/public
 335 -    LDAP_LIBDIR=$1/lib
 336 +    LDAP_LIBDIR=$1/lib64
 337    fi
 338  ])
 339
 340 diff -burN php-4.3.9RC2.orig/ext/mcal/config.m4 php-4.3.9RC2/ext/mcal/config.m4
 341 --- php-4.3.9RC2.orig/ext/mcal/config.m4        2004-09-04 13:19:31.000000000 +0200
 342 +++ php-4.3.9RC2/ext/mcal/config.m4     2004-09-04 14:26:05.237559464 +0200
 343 @@ -19,8 +19,8 @@
 344      fi
 345    done
 346
 347 -  for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib/mcal $MCAL_DIR/lib; do
 348 -    if test -r "$i/libmcal.a"; then
 349 +  for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib64 $MCAL_DIR/lib64/mcal $MCAL_DIR/lib64; do
 350 +    if test -r "$i/libmcal.so" -o -r "$i/libmcal.a"; then
 351        MCAL_LIBRARY=$i
 352      fi
 353    done
 354 @@ -31,8 +31,8 @@
 355      fi
 356    done
 357
 358 -  if test ! -f "$MCAL_LIBRARY/libmcal.a"; then
 359 -    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)
 360 +  if test ! -f "$MCAL_LIBRARY/libmcal.a" -a ! -f "$MCAL_LIBRARY/libmcal.so"; then
 361 +    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)
 362    fi
 363
 364    PHP_ADD_INCLUDE($MCAL_INCLUDE)
 365 diff -burN php-4.3.9RC2.orig/ext/ming/config.m4 php-4.3.9RC2/ext/ming/config.m4
 366 --- php-4.3.9RC2.orig/ext/ming/config.m4        2004-09-04 13:19:31.000000000 +0200
 367 +++ php-4.3.9RC2/ext/ming/config.m4     2004-09-04 14:45:05.740176712 +0200
 368 @@ -9,7 +9,7 @@
 369    AC_CHECK_LIB(m, sin)
 370
 371    for i in $PHP_MING /usr/local /usr; do
 372 -    if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then
 373 +    if test -f $i/lib64/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libming.a; then
 374        MING_DIR=$i
 375      fi
 376    done
 377 @@ -33,11 +33,11 @@
 378    ],[
 379      AC_MSG_ERROR([Ming library 0.2a or greater required.])
 380    ],[
 381 -    -L$MING_DIR/lib
 382 +    -L$MING_DIR/lib64
 383    ])
 384
 385    PHP_ADD_INCLUDE($MING_INC_DIR)
 386 -  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD)
 387 +  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib64, MING_SHARED_LIBADD)
 388
 389    AC_MSG_CHECKING([for destroySWFBlock])
 390    AC_TRY_RUN([
 391 diff -burN php-4.3.9RC2.orig/ext/mssql/config.m4 php-4.3.9RC2/ext/mssql/config.m4
 392 --- php-4.3.9RC2.orig/ext/mssql/config.m4       2004-09-04 13:19:32.000000000 +0200
 393 +++ php-4.3.9RC2/ext/mssql/config.m4    2004-09-04 14:45:31.009335216 +0200
 394 @@ -32,12 +32,12 @@
 395      fi
 396    fi
 397
 398 -  if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.a"; then
 399 -     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.a)
 400 +  if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.so"; then
 401 +     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libtds.so)
 402    fi
 403
 404    MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include
 405 -  MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib
 406 +  MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib64
 407
 408    PHP_ADD_INCLUDE($MSSQL_INCDIR)
 409    PHP_ADD_LIBRARY_WITH_PATH(sybdb, $MSSQL_LIBDIR, MSSQL_SHARED_LIBADD)
 410 diff -burN php-4.3.9RC2.orig/ext/mysql/config.m4 php-4.3.9RC2/ext/mysql/config.m4
 411 --- php-4.3.9RC2.orig/ext/mysql/config.m4       2004-09-04 13:19:32.000000000 +0200
 412 +++ php-4.3.9RC2/ext/mysql/config.m4    2004-09-04 14:47:13.436763880 +0200
 413 @@ -22,7 +22,7 @@
 414      /var/run/mysqld/mysqld.sock \
 415      /var/tmp/mysql.sock \
 416      /var/run/mysql/mysql.sock \
 417 -    /var/lib/mysql/mysql.sock \
 418 +    /var/lib64/mysql/mysql.sock \
 419      /var/mysql/mysql.sock \
 420      /usr/local/mysql/var/mysql.sock \
 421      /Private/tmp/mysql.sock \
 422 @@ -114,7 +114,7 @@
 423
 424    MYSQL_MODULE_TYPE=external
 425
 426 -  for i in lib lib/mysql; do
 427 +  for i in lib64 lib64/mysql; do
 428      MYSQL_LIB_CHK($i)
 429    done
 430
 431 @@ -129,9 +129,9 @@
 432        PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [
 433          AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.])
 434        ], [
 435 -        -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR
 436 +        -L$PHP_ZLIB_DIR/lib64 -L$MYSQL_LIB_DIR
 437        ])
 438 -      MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz"
 439 +      MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib64 -lz"
 440      else
 441        PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD)
 442        PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [
 443 diff -burN php-4.3.9RC2.orig/ext/pdf/config.m4 php-4.3.9RC2/ext/pdf/config.m4
 444 --- php-4.3.9RC2.orig/ext/pdf/config.m4 2004-09-04 13:19:30.000000000 +0200
 445 +++ php-4.3.9RC2/ext/pdf/config.m4      2004-09-04 14:47:13.438763576 +0200
 446 @@ -40,11 +40,11 @@
 447    if test "$PHP_JPEG_DIR" != "no"; then
 448      PHP_CHECK_LIBRARY(jpeg,jpeg_read_header,
 449      [
 450 -      PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDF_SHARED_LIBADD)
 451 +      PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib64, PDF_SHARED_LIBADD)
 452      ],[
 453        AC_MSG_ERROR([libjpeg not found!])
 454      ],[
 455 -      -L$PHP_JPEG_DIR/lib
 456 +      -L$PHP_JPEG_DIR/lib64
 457      ])
 458    else
 459      AC_MSG_WARN([If configure fails, try --with-jpeg-dir=<DIR>])
 460 @@ -54,11 +54,11 @@
 461    if test "$PHP_PNG_DIR" != "no"; then
 462      PHP_CHECK_LIBRARY(png,png_create_info_struct,
 463      [
 464 -      PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDF_SHARED_LIBADD)
 465 +      PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib64, PDF_SHARED_LIBADD)
 466      ],[
 467        AC_MSG_ERROR([libpng not found!])
 468      ],[
 469 -      -L$PHP_PNG_DIR/lib
 470 +      -L$PHP_PNG_DIR/lib64
 471      ])
 472    else
 473      AC_MSG_WARN([If configure fails, try --with-png-dir=<DIR>])
 474 @@ -68,11 +68,11 @@
 475    if test "$PHP_TIFF_DIR" != "no"; then
 476      PHP_CHECK_LIBRARY(tiff,TIFFOpen,
 477      [
 478 -      PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDF_SHARED_LIBADD)
 479 +      PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib64, PDF_SHARED_LIBADD)
 480      ],[
 481        AC_MSG_ERROR([libtiff not found!])
 482      ],[
 483 -      -L$PHP_TIFF_DIR/lib
 484 +      -L$PHP_TIFF_DIR/lib64
 485      ])
 486    else
 487      AC_MSG_WARN([If configure fails, try --with-tiff-dir=<DIR>])
 488 @@ -84,7 +84,7 @@
 489      AC_MSG_RESULT([no. If configure fails, try --with-zlib-dir=<DIR>])
 490    else
 491      AC_MSG_RESULT([$PHP_ZLIB_DIR])
 492 -    PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDF_SHARED_LIBADD)
 493 +    PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib64, PDF_SHARED_LIBADD)
 494    fi
 495
 496    dnl #
 497 @@ -118,7 +118,7 @@
 498          PHP_CHECK_LIBRARY(pdf, PDF_show_boxed,
 499          [
 500            AC_DEFINE(HAVE_PDFLIB,1,[ ])
 501 -          PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDF_SHARED_LIBADD)
 502 +          PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib64, PDF_SHARED_LIBADD)
 503            PHP_ADD_INCLUDE($PHP_PDFLIB/include)
 504          ],[
 505            AC_MSG_ERROR([
 506 @@ -127,7 +127,7 @@
 507  See config.log for more information.
 508  ])
 509          ],[
 510 -          -L$PHP_PDFLIB/lib $PDF_SHARED_LIBADD
 511 +          -L$PHP_PDFLIB/lib64 $PDF_SHARED_LIBADD
 512          ])
 513        else
 514          AC_MSG_ERROR([pdflib.h not found! Check the path passed to --with-pdflib=<PATH>. PATH should be the install prefix directory.])
 515 diff -burN php-4.3.9RC2.orig/ext/pgsql/config.m4 php-4.3.9RC2/ext/pgsql/config.m4
 516 --- php-4.3.9RC2.orig/ext/pgsql/config.m4       2004-09-04 13:19:32.000000000 +0200
 517 +++ php-4.3.9RC2/ext/pgsql/config.m4    2004-09-04 14:47:13.440763272 +0200
 518 @@ -29,7 +29,7 @@
 519        fi
 520      done
 521
 522 -    for j in lib lib/pgsql lib/postgres lib/postgresql ""; do
 523 +    for j in lib64 lib64/pgsql lib64/postgres lib64/postgresql ""; do
 524        if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
 525          PGSQL_LIBDIR=$i/$j
 526        fi
 527 diff -burN php-4.3.9RC2.orig/ext/xml/config.m4 php-4.3.9RC2/ext/xml/config.m4
 528 --- php-4.3.9RC2.orig/ext/xml/config.m4 2004-09-04 13:19:30.000000000 +0200
 529 +++ php-4.3.9RC2/ext/xml/config.m4      2004-09-04 14:48:42.401239224 +0200
 530 @@ -30,7 +30,7 @@
 531    else
 532      PHP_NEW_EXTENSION(xml, xml.c, $ext_shared)
 533
 534 -    for i in $PHP_XML $PHP_EXPAT_DIR; do
 535 +    for i in /usr /usr/local $PHP_XML `echo $PHP_EXPAT_DIR | sed -e s/shared,//` ; do
 536        if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then
 537          EXPAT_DIR=$i
 538        fi
 539 diff -burN php-4.3.9RC2.orig/ext/xmlrpc/config.m4 php-4.3.9RC2/ext/xmlrpc/config.m4
 540 --- php-4.3.9RC2.orig/ext/xmlrpc/config.m4      2004-09-04 13:19:34.000000000 +0200
 541 +++ php-4.3.9RC2/ext/xmlrpc/config.m4   2004-09-04 14:47:13.442762968 +0200
 542 @@ -23,9 +23,9 @@
 543
 544    testval=no
 545    for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
 546 -    if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
 547 +    if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then
 548        AC_DEFINE(HAVE_LIBEXPAT2,1,[ ])
 549 -      PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD)
 550 +      PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XMLRPC_SHARED_LIBADD)
 551        PHP_ADD_INCLUDE($i/include)
 552        testval=yes
 553        break
 554 @@ -88,5 +88,5 @@
 555    fi
 556
 557    PHP_ADD_INCLUDE($XMLRPC_DIR)
 558 -  PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD)
 559 +  PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib64, XMLRPC_SHARED_LIBADD)
 560  fi
 561 diff -burN php-4.3.9RC2.orig/ext/xslt/config.m4 php-4.3.9RC2/ext/xslt/config.m4
 562 --- php-4.3.9RC2.orig/ext/xslt/config.m4        2004-09-04 13:19:32.000000000 +0200
 563 +++ php-4.3.9RC2/ext/xslt/config.m4     2004-09-04 14:47:13.444762664 +0200
 564 @@ -98,10 +98,10 @@
 565
 566      found_expat=no
 567      for i in $PHP_EXPAT_DIR $XSLT_DIR /usr/local /usr; do
 568 -      if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
 569 +      if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then
 570          AC_DEFINE(HAVE_LIBEXPAT2, 1, [ ])
 571          PHP_ADD_INCLUDE($i/include)
 572 -        PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XSLT_SHARED_LIBADD)
 573 +        PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XSLT_SHARED_LIBADD)
 574          found_expat=yes
 575          break
 576        fi
 577 @@ -125,7 +125,7 @@
 578
 579      if test "$PHP_SABLOT_JS" != "no"; then
 580        for i in $PHP_SABLOT_JS /usr/local /usr; do
 581 -        if test -f $i/lib/libjs.a -o -f $i/lib/libjs.$SHLIB_SUFFIX_NAME; then
 582 +        if test -f $i/lib64/libjs.a -o -f $i/lib64/libjs.$SHLIB_SUFFIX_NAME; then
 583            PHP_SABLOT_JS_DIR=$i
 584            break
 585          fi
 586 @@ -133,12 +133,12 @@
 587
 588        PHP_CHECK_LIBRARY(js, JS_GetRuntime,
 589        [
 590 -        PHP_ADD_LIBRARY_WITH_PATH(js, $PHP_SABLOT_JS_DIR/lib, XSLT_SHARED_LIBADD)
 591 -        PHP_SABLOT_JS_LIBS="-L$PHP_SABLOT_JS_DIR/lib -ljs"
 592 +        PHP_ADD_LIBRARY_WITH_PATH(js, $PHP_SABLOT_JS_DIR/lib64, XSLT_SHARED_LIBADD)
 593 +        PHP_SABLOT_JS_LIBS="-L$PHP_SABLOT_JS_DIR/lib64 -ljs"
 594        ], [
 595          AC_MSG_ERROR([libjs not found. Please check config.log for more information.])
 596        ], [
 597 -        -L$PHP_SABLOT_JS_DIR/lib
 598 +        -L$PHP_SABLOT_JS_DIR/lib64
 599        ])
 600      fi
 601
 602 @@ -146,7 +146,7 @@
 603      [
 604        AC_DEFINE(HAVE_SABLOT_SET_ENCODING, 1, [ ])
 605      ], [], [
 606 -      -L$XSLT_DIR/lib $PHP_SABLOT_JS_LIBS
 607 +      -L$XSLT_DIR/lib64 $PHP_SABLOT_JS_LIBS
 608      ])
 609
 610      dnl SablotSetOptions implemented in Sablotron CVS > 2002/10/31
 611 @@ -154,14 +154,14 @@
 612      [
 613        AC_DEFINE(HAVE_SABLOT_GET_OPTIONS, 1, [Whether Sablotron supports SablotGetOptions])
 614      ], [], [
 615 -      -L$XSLT_DIR/lib $PHP_SABLOT_JS_LIBS
 616 +      -L$XSLT_DIR/lib64 $PHP_SABLOT_JS_LIBS
 617      ])
 618
 619      AC_DEFINE(HAVE_SABLOT_BACKEND, 1, [ ])
 620    fi
 621
 622    PHP_ADD_INCLUDE($XSLT_DIR/include)
 623 -  PHP_ADD_LIBRARY_WITH_PATH($XSLT_LIBNAME, $XSLT_DIR/lib, XSLT_SHARED_LIBADD)
 624 +  PHP_ADD_LIBRARY_WITH_PATH($XSLT_LIBNAME, $XSLT_DIR/lib64, XSLT_SHARED_LIBADD)
 625
 626    AC_DEFINE(HAVE_XSLT, 1, [ ])
 627  fi