]>
Commit | Line | Data |
---|---|---|
1be67161 AG |
1 | diff -burN php-5.0.3RC2.orig/acinclude.m4 php-5.0.3RC2/acinclude.m4 |
2 | --- php-5.0.3RC2.orig/acinclude.m4 2004-12-13 11:25:23.854667632 +0100 | |
3 | +++ php-5.0.3RC2/acinclude.m4 2004-12-13 11:26:08.477883872 +0100 | |
f9611068 AM |
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 | ||
1be67161 AG |
14 | diff -burN php-5.0.3RC2.orig/ext/cpdf/config.m4 php-5.0.3RC2/ext/cpdf/config.m4 |
15 | --- php-5.0.3RC2.orig/ext/cpdf/config.m4 2004-12-13 11:25:21.724991392 +0100 | |
16 | +++ php-5.0.3RC2/ext/cpdf/config.m4 2004-12-13 11:26:08.485882656 +0100 | |
f9611068 | 17 | @@ -4,7 +4,7 @@ |
8f8b3fef JK |
18 | AC_ARG_WITH(jpeg-dir, |
19 | [ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[ | |
f9611068 | 20 | for i in $withval /usr/local /usr; do |
8f8b3fef | 21 | - if test -f "$i/lib/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libjpeg.a"; then |
f9611068 | 22 | + if test -f "$i/lib64/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib64/libjpeg.a"; then |
8f8b3fef JK |
23 | CPDF_JPEG_DIR=$i |
24 | break; | |
25 | fi | |
da2f4860 | 26 | @@ -13,11 +13,11 @@ |
8f8b3fef JK |
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) | |
f9611068 | 31 | + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib64, CPDF_SHARED_LIBADD) |
8f8b3fef JK |
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 | |
f9611068 | 36 | + -L$CPDF_JPEG_DIR/lib64 |
8f8b3fef JK |
37 | ]) |
38 | ],) | |
39 | ]) | |
f9611068 | 40 | @@ -26,7 +26,7 @@ |
8f8b3fef JK |
41 | AC_ARG_WITH(tiff-dir, |
42 | [ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[ | |
f9611068 | 43 | for i in $withval /usr/local /usr; do |
8f8b3fef | 44 | - if test -f "$i/lib/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libtiff.a"; then |
f9611068 | 45 | + if test -f "$i/lib64/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib64/libtiff.a"; then |
8f8b3fef JK |
46 | CPDF_TIFF_DIR=$i |
47 | break; | |
48 | fi | |
da2f4860 | 49 | @@ -35,11 +35,11 @@ |
8f8b3fef JK |
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) | |
f9611068 | 54 | + PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib64, CPDF_SHARED_LIBADD) |
8f8b3fef JK |
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 | |
f9611068 | 59 | + -L$CPDF_TIFF_DIR/lib64 |
8f8b3fef JK |
60 | ]) |
61 | ],) | |
62 | ]) | |
f9611068 | 63 | @@ -59,12 +59,12 @@ |
8f8b3fef | 64 | |
da2f4860 AM |
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) | |
f9611068 | 68 | + PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib64, CPDF_SHARED_LIBADD) |
da2f4860 | 69 | AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib]) |
8f8b3fef | 70 | ], [ |
da2f4860 | 71 | AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.]) |
8f8b3fef | 72 | ], [ |
da2f4860 | 73 | - -L$i/lib $CPDF_SHARED_LIBADD |
f9611068 | 74 | + -L$i/lib64 $CPDF_SHARED_LIBADD |
8f8b3fef | 75 | ]) |
da2f4860 | 76 | break |
8f8b3fef | 77 | fi |
1be67161 AG |
78 | diff -burN php-5.0.3RC2.orig/ext/dba/config.m4 php-5.0.3RC2/ext/dba/config.m4 |
79 | --- php-5.0.3RC2.orig/ext/dba/config.m4 2004-12-13 11:25:21.641004160 +0100 | |
80 | +++ php-5.0.3RC2/ext/dba/config.m4 2004-12-13 11:26:08.493881440 +0100 | |
81 | @@ -21,7 +21,7 @@ | |
f9611068 AM |
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 | ||
1be67161 | 90 | @@ -121,7 +121,7 @@ |
f9611068 AM |
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 | |
1be67161 | 99 | @@ -153,7 +153,7 @@ |
f9611068 AM |
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 | |
1be67161 | 108 | @@ -171,8 +171,8 @@ |
f9611068 AM |
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 | |
1be67161 | 113 | - PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[ |
f9611068 | 114 | + if test -f $THIS_PREFIX/lib64/lib$LIB.a -o -f $THIS_PREFIX/lib64/lib$LIB.$SHLIB_SUFFIX_NAME; then |
1be67161 | 115 | + PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib64, -l$LIB,[ |
f9611068 AM |
116 | AC_TRY_LINK([ |
117 | #include "$THIS_INCLUDE" | |
118 | ],[ | |
1be67161 | 119 | @@ -367,7 +367,7 @@ |
f9611068 AM |
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 | |
1be67161 | 128 | @@ -409,7 +409,7 @@ |
f9611068 AM |
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 | |
1be67161 AG |
137 | diff -burN php-5.0.3RC2.orig/ext/gd/config.m4 php-5.0.3RC2/ext/gd/config.m4 |
138 | --- php-5.0.3RC2.orig/ext/gd/config.m4 2004-12-13 11:25:21.629005984 +0100 | |
139 | +++ php-5.0.3RC2/ext/gd/config.m4 2004-12-13 11:26:08.497880832 +0100 | |
f9611068 AM |
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 | ]) | |
1be67161 | 245 | @@ -363,7 +363,7 @@ |
f9611068 AM |
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 | ||
1be67161 AG |
254 | diff -burN php-5.0.3RC2.orig/ext/imap/config.m4 php-5.0.3RC2/ext/imap/config.m4 |
255 | --- php-5.0.3RC2.orig/ext/imap/config.m4 2004-12-13 11:25:21.735989720 +0100 | |
256 | +++ php-5.0.3RC2/ext/imap/config.m4 2004-12-13 11:26:08.503879920 +0100 | |
f9611068 AM |
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 | ||
1be67161 AG |
306 | diff -burN php-5.0.3RC2.orig/ext/ldap/config.m4 php-5.0.3RC2/ext/ldap/config.m4 |
307 | --- php-5.0.3RC2.orig/ext/ldap/config.m4 2004-12-13 11:25:21.741988808 +0100 | |
308 | +++ php-5.0.3RC2/ext/ldap/config.m4 2004-12-13 11:26:08.506879464 +0100 | |
f9611068 AM |
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 | ||
1be67161 AG |
328 | diff -burN php-5.0.3RC2.orig/ext/ming/config.m4 php-5.0.3RC2/ext/ming/config.m4 |
329 | --- php-5.0.3RC2.orig/ext/ming/config.m4 2004-12-13 11:25:21.747987896 +0100 | |
330 | +++ php-5.0.3RC2/ext/ming/config.m4 2004-12-13 11:26:08.519877488 +0100 | |
f9611068 AM |
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([ | |
1be67161 AG |
354 | diff -burN php-5.0.3RC2.orig/ext/mssql/config.m4 php-5.0.3RC2/ext/mssql/config.m4 |
355 | --- php-5.0.3RC2.orig/ext/mssql/config.m4 2004-12-13 11:25:21.898964944 +0100 | |
356 | +++ php-5.0.3RC2/ext/mssql/config.m4 2004-12-13 11:26:58.696249520 +0100 | |
d12f6a04 AG |
357 | @@ -32,12 +32,12 @@ |
358 | fi | |
359 | fi | |
360 | ||
1be67161 AG |
361 | - if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then |
362 | - AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.[a|so]) | |
363 | + if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.so"; then | |
364 | + AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libtds.[a|so]) | |
d12f6a04 AG |
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) | |
1be67161 AG |
373 | diff -burN php-5.0.3RC2.orig/ext/mysql/config.m4 php-5.0.3RC2/ext/mysql/config.m4 |
374 | --- php-5.0.3RC2.orig/ext/mysql/config.m4 2004-12-13 11:25:21.901964488 +0100 | |
375 | +++ php-5.0.3RC2/ext/mysql/config.m4 2004-12-13 11:26:08.524876728 +0100 | |
f9611068 AM |
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, [], [ | |
1be67161 AG |
406 | diff -burN php-5.0.3RC2.orig/ext/pgsql/config.m4 php-5.0.3RC2/ext/pgsql/config.m4 |
407 | --- php-5.0.3RC2.orig/ext/pgsql/config.m4 2004-12-13 11:25:21.913962664 +0100 | |
408 | +++ php-5.0.3RC2/ext/pgsql/config.m4 2004-12-13 11:26:08.526876424 +0100 | |
f9611068 AM |
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 | |
1be67161 AG |
418 | diff -burN php-5.0.3RC2.orig/ext/xml/config.m4 php-5.0.3RC2/ext/xml/config.m4 |
419 | --- php-5.0.3RC2.orig/ext/xml/config.m4 2004-12-13 11:25:21.716992608 +0100 | |
420 | +++ php-5.0.3RC2/ext/xml/config.m4 2004-12-13 11:26:08.528876120 +0100 | |
f9611068 AM |
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 | ||
1be67161 AG |
439 | diff -burN php-5.0.3RC2.orig/ext/xmlrpc/config.m4 php-5.0.3RC2/ext/xmlrpc/config.m4 |
440 | --- php-5.0.3RC2.orig/ext/xmlrpc/config.m4 2004-12-13 11:25:22.261909768 +0100 | |
441 | +++ php-5.0.3RC2/ext/xmlrpc/config.m4 2004-12-13 11:26:08.532875512 +0100 | |
f9611068 AM |
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 | ||
1be67161 AG |
462 | diff -burN php-5.0.3RC2.orig/php.ini php-5.0.3RC2/php.ini |
463 | --- php-5.0.3RC2.orig/php.ini 2004-12-13 11:25:23.870665200 +0100 | |
464 | +++ php-5.0.3RC2/php.ini 2004-12-13 11:26:08.538874600 +0100 | |
d12f6a04 AG |
465 | @@ -514,7 +514,7 @@ |
466 | user_dir = | |
467 | ||
468 | ; Directory in which the loadable extensions (modules) reside. | |
469 | -extension_dir = "/usr/lib/php" | |
470 | +extension_dir = "/usr/lib64/php" | |
471 | ||
472 | ; Whether or not to enable the dl() function. The dl() function does NOT work | |
473 | ; properly in multithreaded servers, such as IIS or Zeus, and is automatically | |
1be67161 AG |
474 | diff -burN php-5.0.3RC2.orig/scripts/Makefile.frag php-5.0.3RC2/scripts/Makefile.frag |
475 | --- php-5.0.3RC2.orig/scripts/Makefile.frag 2004-12-13 11:25:23.782678576 +0100 | |
476 | +++ php-5.0.3RC2/scripts/Makefile.frag 2004-12-13 11:26:08.544873688 +0100 | |
477 | @@ -4,7 +4,7 @@ | |
478 | # | |
479 | ||
480 | phpincludedir = $(includedir)/php | |
481 | -phpbuilddir = $(prefix)/lib/php/build | |
482 | +phpbuilddir = $(libdir)/php/build | |
483 | ||
484 | BUILD_FILES = \ | |
485 | scripts/phpize.m4 \ |