]>
Commit | Line | Data |
---|---|---|
1 | diff -urbB php-4.4.0.org/acinclude.m4 php-4.4.0/acinclude.m4 | |
2 | --- php-4.4.0.org/acinclude.m4 2005-07-11 21:44:02.634975000 +0200 | |
3 | +++ php-4.4.0/acinclude.m4 2005-07-11 21:44:33.630263256 +0200 | |
4 | @@ -1731,6 +1731,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 -urbB php-4.4.0.org/ext/cpdf/config.m4 php-4.4.0/ext/cpdf/config.m4 | |
15 | --- php-4.4.0.org/ext/cpdf/config.m4 2004-12-30 08:02:16.000000000 +0100 | |
16 | +++ php-4.4.0/ext/cpdf/config.m4 2005-07-11 21:44:33.631263104 +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 | @@ -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 -urbB php-4.4.0.org/ext/crack/config.m4 php-4.4.0/ext/crack/config.m4 | |
81 | --- php-4.4.0.org/ext/crack/config.m4 2004-12-31 04:10:59.000000000 +0100 | |
82 | +++ php-4.4.0/ext/crack/config.m4 2005-07-11 21:44:33.631263104 +0200 | |
83 | @@ -7,7 +7,7 @@ | |
84 | ||
85 | if test "$PHP_CRACK" != "no"; then | |
86 | ||
87 | - for i in $PHP_CRACK/lib $PHP_CRACK/cracklib /usr/local/lib /usr/lib; do | |
88 | + for i in $PHP_CRACK/lib64 $PHP_CRACK/cracklib /usr/local/lib64 /usr/lib64; do | |
89 | test -f $i/libcrack.$SHLIB_SUFFIX_NAME -o -f $i/libcrack.a && CRACK_LIBDIR=$i && break | |
90 | test -f $i/libcrack_krb5.$SHLIB_SUFFIX_NAME -o -f $i/libcrack_krb5.a && CRACK_LIBDIR=$i && break | |
91 | done | |
92 | diff -urbB php-4.4.0.org/ext/dba/config.m4 php-4.4.0/ext/dba/config.m4 | |
93 | --- php-4.4.0.org/ext/dba/config.m4 2005-07-11 21:44:02.637974000 +0200 | |
94 | +++ php-4.4.0/ext/dba/config.m4 2005-07-11 21:44:33.632262952 +0200 | |
95 | @@ -21,7 +21,7 @@ | |
96 | dnl Assign INCLUDE/LFLAGS from PREFIX | |
97 | AC_DEFUN([PHP_DBA_STD_ASSIGN],[ | |
98 | if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then | |
99 | - THIS_LFLAGS=$THIS_PREFIX/lib | |
100 | + THIS_LFLAGS=$THIS_PREFIX/lib64 | |
101 | fi | |
102 | ]) | |
103 | ||
104 | @@ -85,7 +85,7 @@ | |
105 | AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) | |
106 | AC_DEFINE(DBA_GDBM, 1, [ ]) | |
107 | THIS_LIBS=gdbm | |
108 | - ], [], [-L$THIS_PREFIX/lib]) | |
109 | + ], [], [-L$THIS_PREFIX/lib64]) | |
110 | fi | |
111 | ||
112 | PHP_DBA_STD_ASSIGN | |
113 | @@ -117,7 +117,7 @@ | |
114 | AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) | |
115 | AC_DEFINE(DBA_NDBM, 1, [ ]) | |
116 | THIS_LIBS=$LIB | |
117 | - ], [], [-L$THIS_PREFIX/lib]) | |
118 | + ], [], [-L$THIS_PREFIX/lib64]) | |
119 | if test -n "$THIS_LIBS"; then | |
120 | break | |
121 | fi | |
122 | @@ -135,8 +135,8 @@ | |
123 | dnl parameters(version, library list, function) | |
124 | AC_DEFUN([PHP_DBA_DB_CHECK],[ | |
125 | for LIB in $2; do | |
126 | - if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then | |
127 | - PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[ | |
128 | + if test -f $THIS_PREFIX/lib64/lib$LIB.a -o -f $THIS_PREFIX/lib64/lib$LIB.$SHLIB_SUFFIX_NAME; then | |
129 | + PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib64, -l$LIB,[ | |
130 | AC_TRY_LINK([ | |
131 | #include "$THIS_INCLUDE" | |
132 | ],[ | |
133 | @@ -328,7 +328,7 @@ | |
134 | fi | |
135 | AC_DEFINE(DBA_DBM, 1, [ ]) | |
136 | THIS_LIBS=$LIB | |
137 | - ], [], [-L$THIS_PREFIX/lib]) | |
138 | + ], [], [-L$THIS_PREFIX/lib64]) | |
139 | if test -n "$THIS_LIBS"; then | |
140 | break | |
141 | fi | |
142 | @@ -370,7 +370,7 @@ | |
143 | AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) | |
144 | AC_DEFINE(DBA_CDB, 1, [ ]) | |
145 | THIS_LIBS=$LIB | |
146 | - ], [], [-L$THIS_PREFIX/lib]) | |
147 | + ], [], [-L$THIS_PREFIX/lib64]) | |
148 | if test -n "$THIS_LIBS"; then | |
149 | break | |
150 | fi | |
151 | diff -urbB php-4.4.0.org/ext/domxml/config.m4 php-4.4.0/ext/domxml/config.m4 | |
152 | --- php-4.4.0.org/ext/domxml/config.m4 2004-12-30 08:02:17.000000000 +0100 | |
153 | +++ php-4.4.0/ext/domxml/config.m4 2005-07-11 21:44:33.632262952 +0200 | |
154 | @@ -50,7 +50,7 @@ | |
155 | ||
156 | PHP_DOM_CHECK_VERSION | |
157 | ||
158 | - if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then | |
159 | + if test -f $DOMXML_DIR/lib64/libxml2.a -o -f $DOMXML_DIR/lib64/libxml2.$SHLIB_SUFFIX_NAME ; then | |
160 | DOM_LIBNAME=xml2 | |
161 | else | |
162 | DOM_LIBNAME=xml | |
163 | @@ -62,7 +62,7 @@ | |
164 | DOM_LIBS=`$XML2_CONFIG --libs` | |
165 | PHP_EVAL_LIBLINE($DOM_LIBS, DOMXML_SHARED_LIBADD) | |
166 | else | |
167 | - PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) | |
168 | + PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib64, DOMXML_SHARED_LIBADD) | |
169 | fi | |
170 | ||
171 | PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD) | |
172 | @@ -70,7 +70,7 @@ | |
173 | if test "$PHP_ZLIB_DIR" = "no"; then | |
174 | AC_MSG_ERROR(DOMXML requires ZLIB. Use --with-zlib-dir=<DIR>) | |
175 | else | |
176 | - PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, DOMXML_SHARED_LIBADD) | |
177 | + PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib64, DOMXML_SHARED_LIBADD) | |
178 | fi | |
179 | ||
180 | AC_DEFINE(HAVE_DOMXML,1,[ ]) | |
181 | @@ -137,7 +137,7 @@ | |
182 | ||
183 | PHP_DOM_XSLT_CHECK_VERSION | |
184 | ||
185 | - PHP_ADD_LIBRARY_WITH_PATH(xslt, $DOMXSLT_DIR/lib, DOMXML_SHARED_LIBADD) | |
186 | + PHP_ADD_LIBRARY_WITH_PATH(xslt, $DOMXSLT_DIR/lib64, DOMXML_SHARED_LIBADD) | |
187 | ||
188 | PHP_ADD_INCLUDE($DOMXSLT_DIR/include) | |
189 | ||
190 | @@ -145,17 +145,17 @@ | |
191 | AC_MSG_ERROR(DOMXSLT requires DOMXML. Use --with-dom=<DIR>) | |
192 | fi | |
193 | ||
194 | - if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then | |
195 | + if test -f $DOMXML_DIR/lib64/libxml2.a -o -f $DOMXML_DIR/lib64/libxml2.$SHLIB_SUFFIX_NAME ; then | |
196 | DOM_LIBNAME=xml2 | |
197 | else | |
198 | DOM_LIBNAME=xml | |
199 | fi | |
200 | ||
201 | - PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) | |
202 | + PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib64, DOMXML_SHARED_LIBADD) | |
203 | PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD) | |
204 | ||
205 | - if test -f $DOMXML_DIR/lib/libxsltbreakpoint.a -o -f $DOMXML_DIR/lib/libxsltbreakpoint.$SHLIB_SUFFIX_NAME ; then | |
206 | - PHP_ADD_LIBRARY_WITH_PATH(xsltbreakpoint, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) | |
207 | + if test -f $DOMXML_DIR/lib64/libxsltbreakpoint.a -o -f $DOMXML_DIR/lib64/libxsltbreakpoint.$SHLIB_SUFFIX_NAME ; then | |
208 | + PHP_ADD_LIBRARY_WITH_PATH(xsltbreakpoint, $DOMXML_DIR/lib64, DOMXML_SHARED_LIBADD) | |
209 | fi | |
210 | ||
211 | AC_DEFINE(HAVE_DOMXSLT,1,[ ]) | |
212 | @@ -187,7 +187,7 @@ | |
213 | ||
214 | PHP_DOM_EXSLT_CHECK_VERSION | |
215 | ||
216 | - PHP_ADD_LIBRARY_WITH_PATH(exslt, $DOMEXSLT_DIR/lib, DOMXML_SHARED_LIBADD) | |
217 | + PHP_ADD_LIBRARY_WITH_PATH(exslt, $DOMEXSLT_DIR/lib64, DOMXML_SHARED_LIBADD) | |
218 | ||
219 | PHP_ADD_INCLUDE($DOMEXSLT_DIR/include) | |
220 | ||
221 | diff -urbB php-4.4.0.org/ext/gd/config.m4 php-4.4.0/ext/gd/config.m4 | |
222 | --- php-4.4.0.org/ext/gd/config.m4 2005-05-17 14:23:09.000000000 +0200 | |
223 | +++ php-4.4.0/ext/gd/config.m4 2005-07-11 21:44:33.633262800 +0200 | |
224 | @@ -51,7 +51,7 @@ | |
225 | if test "$PHP_JPEG_DIR" != "no"; then | |
226 | ||
227 | for i in $PHP_JPEG_DIR /usr/local /usr; do | |
228 | - test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i && break | |
229 | + test -f $i/lib64/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libjpeg.a && GD_JPEG_DIR=$i && break | |
230 | done | |
231 | ||
232 | if test -z "$GD_JPEG_DIR"; then | |
233 | @@ -61,11 +61,11 @@ | |
234 | PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, | |
235 | [ | |
236 | PHP_ADD_INCLUDE($GD_JPEG_DIR/include) | |
237 | - PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD) | |
238 | + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib64, GD_SHARED_LIBADD) | |
239 | ],[ | |
240 | AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.]) | |
241 | ],[ | |
242 | - -L$GD_JPEG_DIR/lib | |
243 | + -L$GD_JPEG_DIR/lib64 | |
244 | ]) | |
245 | else | |
246 | AC_MSG_RESULT([If configure fails try --with-jpeg-dir=<DIR>]) | |
247 | @@ -76,7 +76,7 @@ | |
248 | if test "$PHP_PNG_DIR" != "no"; then | |
249 | ||
250 | for i in $PHP_PNG_DIR /usr/local /usr; do | |
251 | - test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i && break | |
252 | + test -f $i/lib64/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libpng.a && GD_PNG_DIR=$i && break | |
253 | done | |
254 | ||
255 | if test -z "$GD_PNG_DIR"; then | |
256 | @@ -94,12 +94,12 @@ | |
257 | PHP_CHECK_LIBRARY(png,png_write_image, | |
258 | [ | |
259 | PHP_ADD_INCLUDE($GD_PNG_DIR/include) | |
260 | - PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD) | |
261 | - PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD) | |
262 | + PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib64, GD_SHARED_LIBADD) | |
263 | + PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib64, GD_SHARED_LIBADD) | |
264 | ],[ | |
265 | AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.]) | |
266 | ],[ | |
267 | - -L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib | |
268 | + -L$PHP_ZLIB_DIR/lib64 -lz -L$GD_PNG_DIR/lib64 | |
269 | ]) | |
270 | ||
271 | else | |
272 | @@ -111,7 +111,7 @@ | |
273 | if test "$PHP_XPM_DIR" != "no"; then | |
274 | ||
275 | for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do | |
276 | - test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i && break | |
277 | + test -f $i/lib64/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libXpm.a && GD_XPM_DIR=$i && break | |
278 | done | |
279 | ||
280 | if test -z "$GD_XPM_DIR"; then | |
281 | @@ -129,12 +129,12 @@ | |
282 | PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage, | |
283 | [ | |
284 | PHP_ADD_INCLUDE($GD_XPM_INC) | |
285 | - PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) | |
286 | - PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) | |
287 | + PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib64, GD_SHARED_LIBADD) | |
288 | + PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib64, GD_SHARED_LIBADD) | |
289 | ],[ | |
290 | AC_MSG_ERROR([Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.]) | |
291 | ],[ | |
292 | - -L$GD_XPM_DIR/lib -lX11 | |
293 | + -L$GD_XPM_DIR/lib64 -lX11 | |
294 | ]) | |
295 | else | |
296 | AC_MSG_RESULT(If configure fails try --with-xpm-dir=<DIR>) | |
297 | @@ -163,7 +163,7 @@ | |
298 | fi | |
299 | if test -n "$TTF_DIR" ; then | |
300 | AC_DEFINE(HAVE_LIBTTF,1,[ ]) | |
301 | - PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib, GD_SHARED_LIBADD) | |
302 | + PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib64, GD_SHARED_LIBADD) | |
303 | fi | |
304 | if test -z "$TTF_INC_DIR"; then | |
305 | TTF_INC_DIR=$TTF_DIR/include | |
306 | @@ -187,7 +187,7 @@ | |
307 | done | |
308 | ||
309 | if test -n "$FREETYPE2_DIR" ; then | |
310 | - PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD) | |
311 | + PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib64, GD_SHARED_LIBADD) | |
312 | PHP_ADD_INCLUDE($FREETYPE2_DIR/include) | |
313 | PHP_ADD_INCLUDE($FREETYPE2_INC_DIR) | |
314 | AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) | |
315 | @@ -215,11 +215,11 @@ | |
316 | [ | |
317 | AC_DEFINE(HAVE_LIBT1,1,[ ]) | |
318 | PHP_ADD_INCLUDE($GD_T1_DIR/include) | |
319 | - PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib, GD_SHARED_LIBADD) | |
320 | + PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib64, GD_SHARED_LIBADD) | |
321 | ],[ | |
322 | AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) | |
323 | ],[ | |
324 | - -L$GD_T1_DIR/lib | |
325 | + -L$GD_T1_DIR/lib64 | |
326 | ]) | |
327 | fi | |
328 | ]) | |
329 | @@ -365,7 +365,7 @@ | |
330 | done | |
331 | ||
332 | dnl Library path | |
333 | - for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do | |
334 | + for i in lib64/gd1.3 lib64/gd lib64 gd1.3 gd ""; do | |
335 | test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i" | |
336 | done | |
337 | ||
338 | diff -urbB php-4.4.0.org/ext/imap/config.m4 php-4.4.0/ext/imap/config.m4 | |
339 | --- php-4.4.0.org/ext/imap/config.m4 2005-01-11 05:56:57.000000000 +0100 | |
340 | +++ php-4.4.0/ext/imap/config.m4 2005-07-11 21:44:33.634262648 +0200 | |
341 | @@ -160,13 +160,13 @@ | |
342 | ||
343 | if test -r "$IMAP_DIR/c-client/c-client.a"; then | |
344 | ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 | |
345 | - elif test -r "$IMAP_DIR/lib/c-client.a"; then | |
346 | - ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 | |
347 | + elif test -r "$IMAP_DIR/lib64/c-client.a"; then | |
348 | + ln -s "$IMAP_DIR/lib64/c-client.a" "$IMAP_DIR/lib64/libc-client.a" >/dev/null 2>&1 | |
349 | fi | |
350 | ||
351 | for lib in c-client4 c-client imap; do | |
352 | IMAP_LIB=$lib | |
353 | - IMAP_LIB_CHK(lib) | |
354 | + IMAP_LIB_CHK(lib64) | |
355 | IMAP_LIB_CHK(c-client) | |
356 | done | |
357 | ||
358 | diff -urbB php-4.4.0.org/ext/ldap/config.m4 php-4.4.0/ext/ldap/config.m4 | |
359 | --- php-4.4.0.org/ext/ldap/config.m4 2005-05-08 18:06:24.000000000 +0200 | |
360 | +++ php-4.4.0/ext/ldap/config.m4 2005-07-11 21:44:33.634262648 +0200 | |
361 | @@ -6,15 +6,15 @@ | |
362 | if test -f $1/include/ldap.h; then | |
363 | LDAP_DIR=$1 | |
364 | LDAP_INCDIR=$1/include | |
365 | - LDAP_LIBDIR=$1/lib | |
366 | + LDAP_LIBDIR=$1/lib64 | |
367 | elif test -f $1/include/umich-ldap/ldap.h; then | |
368 | LDAP_DIR=$1 | |
369 | LDAP_INCDIR=$1/include/umich-ldap | |
370 | - LDAP_LIBDIR=$1/lib | |
371 | + LDAP_LIBDIR=$1/lib64 | |
372 | elif test -f $1/ldap/public/ldap.h; then | |
373 | LDAP_DIR=$1 | |
374 | LDAP_INCDIR=$1/ldap/public | |
375 | - LDAP_LIBDIR=$1/lib | |
376 | + LDAP_LIBDIR=$1/lib64 | |
377 | fi | |
378 | ]) | |
379 | ||
380 | diff -urbB php-4.4.0.org/ext/mcal/config.m4 php-4.4.0/ext/mcal/config.m4 | |
381 | --- php-4.4.0.org/ext/mcal/config.m4 2005-07-11 21:44:02.612978000 +0200 | |
382 | +++ php-4.4.0/ext/mcal/config.m4 2005-07-11 21:44:33.635262496 +0200 | |
383 | @@ -19,7 +19,7 @@ | |
384 | fi | |
385 | done | |
386 | ||
387 | - for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib/mcal $MCAL_DIR/lib; do | |
388 | + for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib64 $MCAL_DIR/lib64/mcal $MCAL_DIR/lib64; do | |
389 | if test -r "$i/libmcal.so" -o -r "$i/libmcal.a"; then | |
390 | MCAL_LIBRARY=$i | |
391 | fi | |
392 | @@ -32,7 +32,7 @@ | |
393 | done | |
394 | ||
395 | if test ! -f "$MCAL_LIBRARY/libmcal.a" -a ! -f "$MCAL_LIBRARY/libmcal.so"; then | |
396 | - AC_MSG_ERROR(Unable to locate your libmcal library files - libmcal.* should be in the directory you specify or in the lib/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH) | |
397 | + 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) | |
398 | fi | |
399 | ||
400 | PHP_ADD_INCLUDE($MCAL_INCLUDE) | |
401 | diff -urbB php-4.4.0.org/ext/ming/config.m4 php-4.4.0/ext/ming/config.m4 | |
402 | --- php-4.4.0.org/ext/ming/config.m4 2003-07-11 09:48:33.000000000 +0200 | |
403 | +++ php-4.4.0/ext/ming/config.m4 2005-07-11 21:44:33.635262496 +0200 | |
404 | @@ -9,7 +9,7 @@ | |
405 | AC_CHECK_LIB(m, sin) | |
406 | ||
407 | for i in $PHP_MING /usr/local /usr; do | |
408 | - if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then | |
409 | + if test -f $i/lib64/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libming.a; then | |
410 | MING_DIR=$i | |
411 | fi | |
412 | done | |
413 | @@ -33,11 +33,11 @@ | |
414 | ],[ | |
415 | AC_MSG_ERROR([Ming library 0.2a or greater required.]) | |
416 | ],[ | |
417 | - -L$MING_DIR/lib | |
418 | + -L$MING_DIR/lib64 | |
419 | ]) | |
420 | ||
421 | PHP_ADD_INCLUDE($MING_INC_DIR) | |
422 | - PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD) | |
423 | + PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib64, MING_SHARED_LIBADD) | |
424 | ||
425 | AC_MSG_CHECKING([for destroySWFBlock]) | |
426 | AC_TRY_RUN([ | |
427 | diff -urbB php-4.4.0.org/ext/mssql/config.m4 php-4.4.0/ext/mssql/config.m4 | |
428 | --- php-4.4.0.org/ext/mssql/config.m4 2004-12-08 19:59:11.000000000 +0100 | |
429 | +++ php-4.4.0/ext/mssql/config.m4 2005-07-11 21:44:33.635262496 +0200 | |
430 | @@ -32,12 +32,12 @@ | |
431 | fi | |
432 | fi | |
433 | ||
434 | - if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib/libsybdb.so"; then | |
435 | - AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libsybdb.[a|so]) | |
436 | + if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libsybdb.so"; then | |
437 | + AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libsybdb.[a|so]) | |
438 | fi | |
439 | ||
440 | MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include | |
441 | - MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib | |
442 | + MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib64 | |
443 | ||
444 | PHP_ADD_INCLUDE($MSSQL_INCDIR) | |
445 | PHP_ADD_LIBRARY_WITH_PATH(sybdb, $MSSQL_LIBDIR, MSSQL_SHARED_LIBADD) | |
446 | diff -urbB php-4.4.0.org/ext/mysql/config.m4 php-4.4.0/ext/mysql/config.m4 | |
447 | --- php-4.4.0.org/ext/mysql/config.m4 2005-07-11 21:44:02.630975000 +0200 | |
448 | +++ php-4.4.0/ext/mysql/config.m4 2005-07-11 21:44:33.636262344 +0200 | |
449 | @@ -22,7 +22,7 @@ | |
450 | /var/run/mysqld/mysqld.sock \ | |
451 | /var/tmp/mysql.sock \ | |
452 | /var/run/mysql/mysql.sock \ | |
453 | - /var/lib/mysql/mysql.sock \ | |
454 | + /var/lib64/mysql/mysql.sock \ | |
455 | /var/mysql/mysql.sock \ | |
456 | /usr/local/mysql/var/mysql.sock \ | |
457 | /Private/tmp/mysql.sock \ | |
458 | @@ -115,7 +115,7 @@ | |
459 | ||
460 | MYSQL_MODULE_TYPE=external | |
461 | ||
462 | - for i in lib lib/mysql; do | |
463 | + for i in lib64 lib64/mysql; do | |
464 | MYSQL_LIB_CHK($i) | |
465 | done | |
466 | ||
467 | @@ -130,9 +130,9 @@ | |
468 | PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [ | |
469 | AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.]) | |
470 | ], [ | |
471 | - -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR | |
472 | + -L$PHP_ZLIB_DIR/lib64 -L$MYSQL_LIB_DIR | |
473 | ]) | |
474 | - MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz" | |
475 | + MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib64 -lz" | |
476 | else | |
477 | PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) | |
478 | PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [ | |
479 | diff -urbB php-4.4.0.org/ext/xml/config.m4 php-4.4.0/ext/xml/config.m4 | |
480 | --- php-4.4.0.org/ext/xml/config.m4 2005-07-11 21:44:02.598980000 +0200 | |
481 | +++ php-4.4.0/ext/xml/config.m4 2005-07-11 21:44:33.637262192 +0200 | |
482 | @@ -31,7 +31,7 @@ | |
483 | PHP_NEW_EXTENSION(xml, xml.c, $ext_shared) | |
484 | ||
485 | for i in /usr /usr/local $PHP_XML `echo $PHP_EXPAT_DIR | sed -e s/shared,//` ; do | |
486 | - if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then | |
487 | + if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME ; then | |
488 | EXPAT_DIR=$i | |
489 | fi | |
490 | done | |
491 | @@ -41,7 +41,7 @@ | |
492 | fi | |
493 | ||
494 | PHP_ADD_INCLUDE($EXPAT_DIR/include) | |
495 | - PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD) | |
496 | + PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib64, XML_SHARED_LIBADD) | |
497 | PHP_SUBST(XML_SHARED_LIBADD) | |
498 | fi | |
499 | fi | |
500 | diff -urbB php-4.4.0.org/ext/xmlrpc/config.m4 php-4.4.0/ext/xmlrpc/config.m4 | |
501 | --- php-4.4.0.org/ext/xmlrpc/config.m4 2005-07-11 21:44:02.632975000 +0200 | |
502 | +++ php-4.4.0/ext/xmlrpc/config.m4 2005-07-11 21:44:33.637262192 +0200 | |
503 | @@ -23,9 +23,9 @@ | |
504 | ||
505 | testval=no | |
506 | for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do | |
507 | - if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then | |
508 | + if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then | |
509 | AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) | |
510 | - PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD) | |
511 | + PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XMLRPC_SHARED_LIBADD) | |
512 | PHP_ADD_INCLUDE($i/include) | |
513 | testval=yes | |
514 | break | |
515 | @@ -90,5 +90,5 @@ | |
516 | PHP_NEW_EXTENSION(xmlrpc,xmlrpc-epi-php.c,$ext_shared) | |
517 | XMLRPC_MODULE_TYPE=external | |
518 | PHP_ADD_INCLUDE($XMLRPC_DIR) | |
519 | - PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD) | |
520 | + PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib64, XMLRPC_SHARED_LIBADD) | |
521 | fi | |
522 | diff -urbB php-4.4.0.org/ext/xslt/config.m4 php-4.4.0/ext/xslt/config.m4 | |
523 | --- php-4.4.0.org/ext/xslt/config.m4 2004-08-18 07:14:16.000000000 +0200 | |
524 | +++ php-4.4.0/ext/xslt/config.m4 2005-07-11 21:44:33.638262040 +0200 | |
525 | @@ -98,10 +98,10 @@ | |
526 | ||
527 | found_expat=no | |
528 | for i in $PHP_EXPAT_DIR $XSLT_DIR /usr/local /usr; do | |
529 | - if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then | |
530 | + if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then | |
531 | AC_DEFINE(HAVE_LIBEXPAT2, 1, [ ]) | |
532 | PHP_ADD_INCLUDE($i/include) | |
533 | - PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XSLT_SHARED_LIBADD) | |
534 | + PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XSLT_SHARED_LIBADD) | |
535 | found_expat=yes | |
536 | break | |
537 | fi | |
538 | @@ -125,7 +125,7 @@ | |
539 | ||
540 | if test "$PHP_SABLOT_JS" != "no"; then | |
541 | for i in $PHP_SABLOT_JS /usr/local /usr; do | |
542 | - if test -f $i/lib/libjs.a -o -f $i/lib/libjs.$SHLIB_SUFFIX_NAME; then | |
543 | + if test -f $i/lib64/libjs.a -o -f $i/lib64/libjs.$SHLIB_SUFFIX_NAME; then | |
544 | PHP_SABLOT_JS_DIR=$i | |
545 | break | |
546 | fi | |
547 | @@ -134,11 +134,11 @@ | |
548 | PHP_CHECK_LIBRARY(js, JS_GetRuntime, | |
549 | [ | |
550 | PHP_ADD_LIBRARY_WITH_PATH(js, $PHP_SABLOT_JS_DIR/lib, XSLT_SHARED_LIBADD) | |
551 | - PHP_SABLOT_JS_LIBS="-L$PHP_SABLOT_JS_DIR/lib -ljs" | |
552 | + PHP_SABLOT_JS_LIBS="-L$PHP_SABLOT_JS_DIR/lib64 -ljs" | |
553 | ], [ | |
554 | AC_MSG_ERROR([libjs not found. Please check config.log for more information.]) | |
555 | ], [ | |
556 | - -L$PHP_SABLOT_JS_DIR/lib | |
557 | + -L$PHP_SABLOT_JS_DIR/lib64 | |
558 | ]) | |
559 | fi | |
560 | ||
561 | @@ -146,7 +146,7 @@ | |
562 | [ | |
563 | AC_DEFINE(HAVE_SABLOT_SET_ENCODING, 1, [ ]) | |
564 | ], [], [ | |
565 | - -L$XSLT_DIR/lib $PHP_SABLOT_JS_LIBS | |
566 | + -L$XSLT_DIR/lib64 $PHP_SABLOT_JS_LIBS | |
567 | ]) | |
568 | ||
569 | dnl SablotSetOptions implemented in Sablotron CVS > 2002/10/31 | |
570 | @@ -154,14 +154,14 @@ | |
571 | [ | |
572 | AC_DEFINE(HAVE_SABLOT_GET_OPTIONS, 1, [Whether Sablotron supports SablotGetOptions]) | |
573 | ], [], [ | |
574 | - -L$XSLT_DIR/lib $PHP_SABLOT_JS_LIBS | |
575 | + -L$XSLT_DIR/lib64 $PHP_SABLOT_JS_LIBS | |
576 | ]) | |
577 | ||
578 | AC_DEFINE(HAVE_SABLOT_BACKEND, 1, [ ]) | |
579 | fi | |
580 | ||
581 | PHP_ADD_INCLUDE($XSLT_DIR/include) | |
582 | - PHP_ADD_LIBRARY_WITH_PATH($XSLT_LIBNAME, $XSLT_DIR/lib, XSLT_SHARED_LIBADD) | |
583 | + PHP_ADD_LIBRARY_WITH_PATH($XSLT_LIBNAME, $XSLT_DIR/lib64, XSLT_SHARED_LIBADD) | |
584 | ||
585 | AC_DEFINE(HAVE_XSLT, 1, [ ]) | |
586 | fi | |
587 | diff -urbB php-4.4.0.org/php.ini php-4.4.0/php.ini | |
588 | --- php-4.4.0.org/php.ini 2005-07-11 21:44:02.628976000 +0200 | |
589 | +++ php-4.4.0/php.ini 2005-07-11 21:44:33.639261888 +0200 | |
590 | @@ -489,7 +489,7 @@ | |
591 | user_dir = | |
592 | ||
593 | ; Directory in which the loadable extensions (modules) reside. | |
594 | -extension_dir = "/usr/lib/php4" | |
595 | +extension_dir = "/usr/lib64/php4" | |
596 | ||
597 | ; Whether or not to enable the dl() function. The dl() function does NOT work | |
598 | ; properly in multithreaded servers, such as IIS or Zeus, and is automatically | |
599 | ||
600 | --- ./ext/pcre/config0.m4~ 2005-05-31 15:22:27.000000000 +0300 | |
601 | +++ ./ext/pcre/config0.m4 2005-09-29 17:42:21.000000000 +0300 | |
602 | @@ -25,7 +25,7 @@ | |
603 | AC_MSG_ERROR([Could not find pcre.h in $PHP_PCRE_REGEX]) | |
604 | fi | |
605 | ||
606 | - for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/lib; do | |
607 | + for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/lib64; do | |
608 | test -f $j/libpcre.a -o -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j | |
609 | done | |
610 |