1 diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/acinclude.m4 php-4.3.5/acinclude.m4
2 --- php-4.3.5.orig/acinclude.m4 2004-04-14 11:29:51.000000000 +0200
3 +++ php-4.3.5/acinclude.m4 2004-04-14 11:42:40.000000000 +0200
5 if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
8 + if test -r $i/lib64/libssl.a -o -r $i/lib64/libssl.$SHLIB_SUFFIX_NAME; then
9 + OPENSSL_LIBDIR=$i/lib64
11 test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break
14 diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/cpdf/config.m4 php-4.3.5/ext/cpdf/config.m4
15 --- php-4.3.5.orig/ext/cpdf/config.m4 2004-04-14 11:29:51.000000000 +0200
16 +++ php-4.3.5/ext/cpdf/config.m4 2004-04-14 11:41:13.000000000 +0200
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
27 AC_MSG_ERROR([libjpeg.(a|so) not found.])
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)
33 AC_MSG_ERROR([CPDF: Problem with libjpeg.(a|so). Please check config.log for more information.])
35 - -L$CPDF_JPEG_DIR/lib
36 + -L$CPDF_JPEG_DIR/lib64
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
50 AC_MSG_ERROR([libtiff.(a|so) not found.])
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)
56 AC_MSG_ERROR([CPDF: Problem with libtiff.(a|so). Please check config.log for more information.])
58 - -L$CPDF_TIFF_DIR/lib
59 + -L$CPDF_TIFF_DIR/lib64
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])
71 AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
73 - -L$i/lib $CPDF_SHARED_LIBADD
74 + -L$i/lib64 $CPDF_SHARED_LIBADD
78 diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/crack/config.m4 php-4.3.5/ext/crack/config.m4
79 --- php-4.3.5.orig/ext/crack/config.m4 2004-04-14 11:29:51.000000000 +0200
80 +++ php-4.3.5/ext/crack/config.m4 2004-04-14 11:41:13.000000000 +0200
83 if test "$PHP_CRACK" != "no"; then
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
90 diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/dba/config.m4 php-4.3.5/ext/dba/config.m4
91 --- php-4.3.5.orig/ext/dba/config.m4 2004-04-14 11:29:51.000000000 +0200
92 +++ php-4.3.5/ext/dba/config.m4 2004-04-14 11:41:13.000000000 +0200
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
103 AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
104 AC_DEFINE(DBA_GDBM, 1, [ ])
106 - ], [], [-L$THIS_PREFIX/lib])
107 + ], [], [-L$THIS_PREFIX/lib64])
112 AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
113 AC_DEFINE(DBA_NDBM, 1, [ ])
115 - ], [], [-L$THIS_PREFIX/lib])
116 + ], [], [-L$THIS_PREFIX/lib64])
117 if test -n "$THIS_LIBS"; then
121 dnl parameters(version, library list, function)
122 AC_DEFUN(PHP_DBA_DB_CHECK,[
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,[
129 #include "$THIS_INCLUDE"
133 AC_DEFINE(DBA_DBM, 1, [ ])
135 - ], [], [-L$THIS_PREFIX/lib])
136 + ], [], [-L$THIS_PREFIX/lib64])
137 if test -n "$THIS_LIBS"; then
141 AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
142 AC_DEFINE(DBA_CDB, 1, [ ])
144 - ], [], [-L$THIS_PREFIX/lib])
145 + ], [], [-L$THIS_PREFIX/lib64])
146 if test -n "$THIS_LIBS"; then
149 diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/gd/config.m4 php-4.3.5/ext/gd/config.m4
150 --- php-4.3.5.orig/ext/gd/config.m4 2004-04-14 11:29:51.000000000 +0200
151 +++ php-4.3.5/ext/gd/config.m4 2004-04-14 11:41:13.000000000 +0200
153 if test "$PHP_JPEG_DIR" != "no"; then
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
160 if test -z "$GD_JPEG_DIR"; then
162 PHP_CHECK_LIBRARY(jpeg,jpeg_read_header,
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)
168 AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.])
171 + -L$GD_JPEG_DIR/lib64
174 AC_MSG_RESULT([If configure fails try --with-jpeg-dir=<DIR>])
176 if test "$PHP_PNG_DIR" != "no"; then
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
183 if test -z "$GD_PNG_DIR"; then
185 PHP_CHECK_LIBRARY(png,png_write_image,
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)
193 AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.])
195 - -L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib
196 + -L$PHP_ZLIB_DIR/lib64 -lz -L$GD_PNG_DIR/lib64
201 if test "$PHP_XPM_DIR" != "no"; then
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
208 if test -z "$GD_XPM_DIR"; then
209 @@ -129,12 +129,12 @@
210 PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage,
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)
218 AC_MSG_ERROR([Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.])
220 - -L$GD_XPM_DIR/lib -lX11
221 + -L$GD_XPM_DIR/lib64 -lX11
224 AC_MSG_RESULT(If configure fails try --with-xpm-dir=<DIR>)
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)
232 if test -z "$TTF_INC_DIR"; then
233 TTF_INC_DIR=$TTF_DIR/include
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 @@
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)
250 AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.])
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"
266 diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/imap/config.m4 php-4.3.5/ext/imap/config.m4
267 --- php-4.3.5.orig/ext/imap/config.m4 2004-04-14 11:29:51.000000000 +0200
268 +++ php-4.3.5/ext/imap/config.m4 2004-04-14 11:41:13.000000000 +0200
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
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])
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)
301 @@ -178,13 +178,13 @@
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
311 for lib in c-client4 c-client imap; do
314 + IMAP_LIB_CHK(lib64)
315 IMAP_LIB_CHK(c-client)
318 diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/ldap/config.m4 php-4.3.5/ext/ldap/config.m4
319 --- php-4.3.5.orig/ext/ldap/config.m4 2004-04-14 11:29:51.000000000 +0200
320 +++ php-4.3.5/ext/ldap/config.m4 2004-04-14 11:41:13.000000000 +0200
322 if test -f $1/include/ldap.h; then
324 LDAP_INCDIR=$1/include
326 + LDAP_LIBDIR=$1/lib64
327 elif test -f $1/include/umich-ldap/ldap.h; then
329 LDAP_INCDIR=$1/include/umich-ldap
331 + LDAP_LIBDIR=$1/lib64
332 elif test -f $1/ldap/public/ldap.h; then
334 LDAP_INCDIR=$1/ldap/public
336 + LDAP_LIBDIR=$1/lib64
340 diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/mcal/config.m4 php-4.3.5/ext/mcal/config.m4
341 --- php-4.3.5.orig/ext/mcal/config.m4 2004-04-14 11:29:51.000000000 +0200
342 +++ php-4.3.5/ext/mcal/config.m4 2004-04-14 11:41:13.000000000 +0200
347 - for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib/mcal $MCAL_DIR/lib; do
348 + for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib64 $MCAL_DIR/lib64/mcal $MCAL_DIR/lib64; do
349 if test -r "$i/libmcal.so" -o -r "$i/libmcal.a"; then
352 diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/ming/config.m4 php-4.3.5/ext/ming/config.m4
353 --- php-4.3.5.orig/ext/ming/config.m4 2004-04-14 11:29:51.000000000 +0200
354 +++ php-4.3.5/ext/ming/config.m4 2004-04-14 11:41:13.000000000 +0200
358 for i in $PHP_MING /usr/local /usr; do
359 - if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then
360 + if test -f $i/lib64/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libming.a; then
366 AC_MSG_ERROR([Ming library 0.2a or greater required.])
372 PHP_ADD_INCLUDE($MING_INC_DIR)
373 - PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD)
374 + PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib64, MING_SHARED_LIBADD)
376 AC_MSG_CHECKING([for destroySWFBlock])
378 diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/mssql/config.m4 php-4.3.5/ext/mssql/config.m4
379 --- php-4.3.5.orig/ext/mssql/config.m4 2004-04-14 11:29:51.000000000 +0200
380 +++ php-4.3.5/ext/mssql/config.m4 2004-04-14 11:41:13.000000000 +0200
385 - if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then
386 - AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.so)
387 + if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.so"; then
388 + AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libtds.so)
391 MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include
392 - MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib
393 + MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib64
395 PHP_ADD_INCLUDE($MSSQL_INCDIR)
396 PHP_ADD_LIBRARY_WITH_PATH(sybdb, $MSSQL_LIBDIR, MSSQL_SHARED_LIBADD)
397 diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/mysql/config.m4 php-4.3.5/ext/mysql/config.m4
398 --- php-4.3.5.orig/ext/mysql/config.m4 2004-04-14 11:29:51.000000000 +0200
399 +++ php-4.3.5/ext/mysql/config.m4 2004-04-14 11:41:13.000000000 +0200
401 /var/run/mysqld/mysqld.sock \
402 /var/tmp/mysql.sock \
403 /var/run/mysql/mysql.sock \
404 - /var/lib/mysql/mysql.sock \
405 + /var/lib64/mysql/mysql.sock \
406 /var/mysql/mysql.sock \
407 /usr/local/mysql/var/mysql.sock \
408 /Private/tmp/mysql.sock \
411 MYSQL_MODULE_TYPE=external
413 - for i in lib lib/mysql; do
414 + for i in lib64 lib64/mysql; do
419 PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [
420 AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.])
422 - -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR
423 + -L$PHP_ZLIB_DIR/lib64 -L$MYSQL_LIB_DIR
425 - MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz"
426 + MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib64 -lz"
428 PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD)
429 PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [
430 diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/pdf/config.m4 php-4.3.5/ext/pdf/config.m4
431 --- php-4.3.5.orig/ext/pdf/config.m4 2004-04-14 11:29:51.000000000 +0200
432 +++ php-4.3.5/ext/pdf/config.m4 2004-04-14 11:41:13.000000000 +0200
434 if test "$PHP_JPEG_DIR" != "no"; then
435 PHP_CHECK_LIBRARY(jpeg,jpeg_read_header,
437 - PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDF_SHARED_LIBADD)
438 + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib64, PDF_SHARED_LIBADD)
440 AC_MSG_ERROR([libjpeg not found!])
442 - -L$PHP_JPEG_DIR/lib
443 + -L$PHP_JPEG_DIR/lib64
446 AC_MSG_WARN([If configure fails, try --with-jpeg-dir=<DIR>])
448 if test "$PHP_PNG_DIR" != "no"; then
449 PHP_CHECK_LIBRARY(png,png_create_info_struct,
451 - PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDF_SHARED_LIBADD)
452 + PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib64, PDF_SHARED_LIBADD)
454 AC_MSG_ERROR([libpng not found!])
457 + -L$PHP_PNG_DIR/lib64
460 AC_MSG_WARN([If configure fails, try --with-png-dir=<DIR>])
462 if test "$PHP_TIFF_DIR" != "no"; then
463 PHP_CHECK_LIBRARY(tiff,TIFFOpen,
465 - PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDF_SHARED_LIBADD)
466 + PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib64, PDF_SHARED_LIBADD)
468 AC_MSG_ERROR([libtiff not found!])
470 - -L$PHP_TIFF_DIR/lib
471 + -L$PHP_TIFF_DIR/lib64
474 AC_MSG_WARN([If configure fails, try --with-tiff-dir=<DIR>])
476 AC_MSG_RESULT([no. If configure fails, try --with-zlib-dir=<DIR>])
478 AC_MSG_RESULT([$PHP_ZLIB_DIR])
479 - PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDF_SHARED_LIBADD)
480 + PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib64, PDF_SHARED_LIBADD)
485 PHP_CHECK_LIBRARY(pdf, PDF_show_boxed,
487 AC_DEFINE(HAVE_PDFLIB,1,[ ])
488 - PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDF_SHARED_LIBADD)
489 + PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib64, PDF_SHARED_LIBADD)
490 PHP_ADD_INCLUDE($PHP_PDFLIB/include)
494 See config.log for more information.
497 - -L$PHP_PDFLIB/lib $PDF_SHARED_LIBADD
498 + -L$PHP_PDFLIB/lib64 $PDF_SHARED_LIBADD
501 AC_MSG_ERROR([pdflib.h not found! Check the path passed to --with-pdflib=<PATH>. PATH should be the install prefix directory.])
502 diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/pgsql/config.m4 php-4.3.5/ext/pgsql/config.m4
503 --- php-4.3.5.orig/ext/pgsql/config.m4 2004-04-14 11:29:51.000000000 +0200
504 +++ php-4.3.5/ext/pgsql/config.m4 2004-04-14 11:41:13.000000000 +0200
509 - for j in lib lib/pgsql lib/postgres lib/postgresql ""; do
510 + for j in lib64 lib64/pgsql lib64/postgres lib64/postgresql ""; do
511 if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
514 diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/xml/config.m4 php-4.3.5/ext/xml/config.m4
515 --- php-4.3.5.orig/ext/xml/config.m4 2004-04-14 11:29:51.000000000 +0200
516 +++ php-4.3.5/ext/xml/config.m4 2004-04-14 11:41:13.000000000 +0200
518 PHP_NEW_EXTENSION(xml, xml.c, $ext_shared)
520 for i in /usr /usr/local $PHP_XML `echo $PHP_EXPAT_DIR | sed -e s/shared,//` ; do
521 - if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then
522 + if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME ; then
529 PHP_ADD_INCLUDE($EXPAT_DIR/include)
530 - PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD)
531 + PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib64, XML_SHARED_LIBADD)
532 PHP_SUBST(XML_SHARED_LIBADD)
535 diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/xmlrpc/config.m4 php-4.3.5/ext/xmlrpc/config.m4
536 --- php-4.3.5.orig/ext/xmlrpc/config.m4 2004-04-14 11:29:51.000000000 +0200
537 +++ php-4.3.5/ext/xmlrpc/config.m4 2004-04-14 11:41:13.000000000 +0200
541 for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
542 - if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
543 + if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then
544 AC_DEFINE(HAVE_LIBEXPAT2,1,[ ])
545 - PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD)
546 + PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XMLRPC_SHARED_LIBADD)
547 PHP_ADD_INCLUDE($i/include)
551 PHP_NEW_EXTENSION(xmlrpc,xmlrpc-epi-php.c,$ext_shared)
552 XMLRPC_MODULE_TYPE=external
553 PHP_ADD_INCLUDE($XMLRPC_DIR)
554 - PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD)
555 + PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib64, XMLRPC_SHARED_LIBADD)
557 diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/xslt/config.m4 php-4.3.5/ext/xslt/config.m4
558 --- php-4.3.5.orig/ext/xslt/config.m4 2004-04-14 11:29:51.000000000 +0200
559 +++ php-4.3.5/ext/xslt/config.m4 2004-04-14 11:41:13.000000000 +0200
563 for i in $PHP_EXPAT_DIR $XSLT_DIR /usr/local /usr; do
564 - if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
565 + if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then
566 AC_DEFINE(HAVE_LIBEXPAT2, 1, [ ])
567 PHP_ADD_INCLUDE($i/include)
568 - PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XSLT_SHARED_LIBADD)
569 + PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XSLT_SHARED_LIBADD)
575 if test "$PHP_SABLOT_JS" != "no"; then
576 for i in $PHP_SABLOT_JS /usr/local /usr; do
577 - if test -f $i/lib/libjs.a -o -f $i/lib/libjs.$SHLIB_SUFFIX_NAME; then
578 + if test -f $i/lib64/libjs.a -o -f $i/lib64/libjs.$SHLIB_SUFFIX_NAME; then
582 @@ -133,12 +133,12 @@
584 PHP_CHECK_LIBRARY(js, JS_GetRuntime,
586 - PHP_ADD_LIBRARY_WITH_PATH(js, $PHP_SABLOT_JS_DIR/lib, XSLT_SHARED_LIBADD)
587 - PHP_SABLOT_JS_LIBS=-L$PHP_SABLOT_JS_DIR/lib -ljs
588 + PHP_ADD_LIBRARY_WITH_PATH(js, $PHP_SABLOT_JS_DIR/lib64, XSLT_SHARED_LIBADD)
589 + PHP_SABLOT_JS_LIBS=-L$PHP_SABLOT_JS_DIR/lib64 -ljs
591 AC_MSG_ERROR([libjs not found. Please check config.log for more information.])
593 - -L$PHP_SABLOT_JS_DIR/lib
594 + -L$PHP_SABLOT_JS_DIR/lib64
600 AC_DEFINE(HAVE_SABLOT_SET_ENCODING, 1, [ ])
602 - -L$XSLT_DIR/lib $PHP_SABLOT_JS_LIBS
603 + -L$XSLT_DIR/lib64 $PHP_SABLOT_JS_LIBS
606 dnl SablotSetOptions implemented in Sablotron CVS > 2002/10/31
607 @@ -154,14 +154,14 @@
609 AC_DEFINE(HAVE_SABLOT_GET_OPTIONS, 1, [Whether Sablotron supports SablotGetOptions])
611 - -L$XSLT_DIR/lib $PHP_SABLOT_JS_LIBS
612 + -L$XSLT_DIR/lib64 $PHP_SABLOT_JS_LIBS
615 AC_DEFINE(HAVE_SABLOT_BACKEND, 1, [ ])
618 PHP_ADD_INCLUDE($XSLT_DIR/include)
619 - PHP_ADD_LIBRARY_WITH_PATH($XSLT_LIBNAME, $XSLT_DIR/lib, XSLT_SHARED_LIBADD)
620 + PHP_ADD_LIBRARY_WITH_PATH($XSLT_LIBNAME, $XSLT_DIR/lib64, XSLT_SHARED_LIBADD)
622 AC_DEFINE(HAVE_XSLT, 1, [ ])