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