]>
Commit | Line | Data |
---|---|---|
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 | |
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 -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 | |
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 | @@ -67,12 +67,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 -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 | |
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 -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 | |
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 -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 | |
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 | @@ -359,7 +359,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 -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 | |
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 -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 | |
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 -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 | |
343 | @@ -19,7 +19,7 @@ | |
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 | + 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 | |
350 | MCAL_LIBRARY=$i | |
351 | fi | |
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 | |
355 | @@ -9,7 +9,7 @@ | |
356 | AC_CHECK_LIB(m, sin) | |
357 | ||
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 | |
361 | MING_DIR=$i | |
362 | fi | |
363 | done | |
364 | @@ -33,11 +33,11 @@ | |
365 | ],[ | |
366 | AC_MSG_ERROR([Ming library 0.2a or greater required.]) | |
367 | ],[ | |
368 | - -L$MING_DIR/lib | |
369 | + -L$MING_DIR/lib64 | |
370 | ]) | |
371 | ||
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) | |
375 | ||
376 | AC_MSG_CHECKING([for destroySWFBlock]) | |
377 | AC_TRY_RUN([ | |
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 | |
381 | @@ -32,12 +32,12 @@ | |
382 | fi | |
383 | fi | |
384 | ||
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) | |
389 | fi | |
390 | ||
391 | MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include | |
392 | - MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib | |
393 | + MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib64 | |
394 | ||
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 | |
400 | @@ -22,7 +22,7 @@ | |
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 \ | |
409 | @@ -115,7 +115,7 @@ | |
410 | ||
411 | MYSQL_MODULE_TYPE=external | |
412 | ||
413 | - for i in lib lib/mysql; do | |
414 | + for i in lib64 lib64/mysql; do | |
415 | MYSQL_LIB_CHK($i) | |
416 | done | |
417 | ||
418 | @@ -130,9 +130,9 @@ | |
419 | PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [ | |
420 | AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.]) | |
421 | ], [ | |
422 | - -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR | |
423 | + -L$PHP_ZLIB_DIR/lib64 -L$MYSQL_LIB_DIR | |
424 | ]) | |
425 | - MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz" | |
426 | + MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib64 -lz" | |
427 | else | |
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 | |
433 | @@ -40,11 +40,11 @@ | |
434 | if test "$PHP_JPEG_DIR" != "no"; then | |
435 | PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, | |
436 | [ | |
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) | |
439 | ],[ | |
440 | AC_MSG_ERROR([libjpeg not found!]) | |
441 | ],[ | |
442 | - -L$PHP_JPEG_DIR/lib | |
443 | + -L$PHP_JPEG_DIR/lib64 | |
444 | ]) | |
445 | else | |
446 | AC_MSG_WARN([If configure fails, try --with-jpeg-dir=<DIR>]) | |
447 | @@ -54,11 +54,11 @@ | |
448 | if test "$PHP_PNG_DIR" != "no"; then | |
449 | PHP_CHECK_LIBRARY(png,png_create_info_struct, | |
450 | [ | |
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) | |
453 | ],[ | |
454 | AC_MSG_ERROR([libpng not found!]) | |
455 | ],[ | |
456 | - -L$PHP_PNG_DIR/lib | |
457 | + -L$PHP_PNG_DIR/lib64 | |
458 | ]) | |
459 | else | |
460 | AC_MSG_WARN([If configure fails, try --with-png-dir=<DIR>]) | |
461 | @@ -68,11 +68,11 @@ | |
462 | if test "$PHP_TIFF_DIR" != "no"; then | |
463 | PHP_CHECK_LIBRARY(tiff,TIFFOpen, | |
464 | [ | |
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) | |
467 | ],[ | |
468 | AC_MSG_ERROR([libtiff not found!]) | |
469 | ],[ | |
470 | - -L$PHP_TIFF_DIR/lib | |
471 | + -L$PHP_TIFF_DIR/lib64 | |
472 | ]) | |
473 | else | |
474 | AC_MSG_WARN([If configure fails, try --with-tiff-dir=<DIR>]) | |
475 | @@ -84,7 +84,7 @@ | |
476 | AC_MSG_RESULT([no. If configure fails, try --with-zlib-dir=<DIR>]) | |
477 | else | |
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) | |
481 | fi | |
482 | ||
483 | dnl # | |
484 | @@ -118,7 +118,7 @@ | |
485 | PHP_CHECK_LIBRARY(pdf, PDF_show_boxed, | |
486 | [ | |
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) | |
491 | ],[ | |
492 | AC_MSG_ERROR([ | |
493 | @@ -127,7 +127,7 @@ | |
494 | See config.log for more information. | |
495 | ]) | |
496 | ],[ | |
497 | - -L$PHP_PDFLIB/lib $PDF_SHARED_LIBADD | |
498 | + -L$PHP_PDFLIB/lib64 $PDF_SHARED_LIBADD | |
499 | ]) | |
500 | else | |
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 | |
505 | @@ -29,7 +29,7 @@ | |
506 | fi | |
507 | done | |
508 | ||
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 | |
512 | PGSQL_LIBDIR=$i/$j | |
513 | fi | |
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 | |
517 | @@ -31,7 +31,7 @@ | |
518 | PHP_NEW_EXTENSION(xml, xml.c, $ext_shared) | |
519 | ||
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 | |
523 | EXPAT_DIR=$i | |
524 | fi | |
525 | done | |
526 | @@ -41,7 +41,7 @@ | |
527 | fi | |
528 | ||
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) | |
533 | fi | |
534 | fi | |
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 | |
538 | @@ -23,9 +23,9 @@ | |
539 | ||
540 | testval=no | |
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) | |
548 | testval=yes | |
549 | break | |
550 | @@ -90,5 +90,5 @@ | |
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) | |
556 | fi | |
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 | |
560 | @@ -98,10 +98,10 @@ | |
561 | ||
562 | found_expat=no | |
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) | |
570 | found_expat=yes | |
571 | break | |
572 | fi | |
573 | @@ -125,7 +125,7 @@ | |
574 | ||
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 | |
579 | PHP_SABLOT_JS_DIR=$i | |
580 | break | |
581 | fi | |
582 | @@ -133,12 +133,12 @@ | |
583 | ||
584 | PHP_CHECK_LIBRARY(js, JS_GetRuntime, | |
585 | [ | |
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 | |
590 | ], [ | |
591 | AC_MSG_ERROR([libjs not found. Please check config.log for more information.]) | |
592 | ], [ | |
593 | - -L$PHP_SABLOT_JS_DIR/lib | |
594 | + -L$PHP_SABLOT_JS_DIR/lib64 | |
595 | ]) | |
596 | fi | |
597 | ||
598 | @@ -146,7 +146,7 @@ | |
599 | [ | |
600 | AC_DEFINE(HAVE_SABLOT_SET_ENCODING, 1, [ ]) | |
601 | ], [], [ | |
602 | - -L$XSLT_DIR/lib $PHP_SABLOT_JS_LIBS | |
603 | + -L$XSLT_DIR/lib64 $PHP_SABLOT_JS_LIBS | |
604 | ]) | |
605 | ||
606 | dnl SablotSetOptions implemented in Sablotron CVS > 2002/10/31 | |
607 | @@ -154,14 +154,14 @@ | |
608 | [ | |
609 | AC_DEFINE(HAVE_SABLOT_GET_OPTIONS, 1, [Whether Sablotron supports SablotGetOptions]) | |
610 | ], [], [ | |
611 | - -L$XSLT_DIR/lib $PHP_SABLOT_JS_LIBS | |
612 | + -L$XSLT_DIR/lib64 $PHP_SABLOT_JS_LIBS | |
613 | ]) | |
614 | ||
615 | AC_DEFINE(HAVE_SABLOT_BACKEND, 1, [ ]) | |
616 | fi | |
617 | ||
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) | |
621 | ||
622 | AC_DEFINE(HAVE_XSLT, 1, [ ]) | |
623 | fi |