]>
Commit | Line | Data |
---|---|---|
f5840ccb | 1 | --- contrib/php4/acinclude.m4~ 2003-08-27 21:23:50.000000000 +0200 |
2 | +++ contrib/php4/acinclude.m4 2004-08-26 13:53:07.000000000 +0200 | |
3 | @@ -193,8 +193,8 @@ | |
4 | if test -r $i/include/openssl/evp.h; then | |
5 | OPENSSL_INCDIR=$i/include | |
6 | fi | |
7 | - if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then | |
8 | - OPENSSL_LIBDIR=$i/lib | |
9 | + if test -r $libdir/libssl.a -o -r $libdir/libssl.$SHLIB_SUFFIX_NAME; then | |
10 | + OPENSSL_LIBDIR=$libdir | |
11 | fi | |
12 | done | |
13 | ||
14 | @@ -699,7 +699,7 @@ | |
15 | AC_MSG_CHECKING([if compiler supports -R]) | |
16 | AC_CACHE_VAL(php_cv_cc_dashr,[ | |
17 | SAVE_LIBS=$LIBS | |
18 | - LIBS="-R /usr/lib $LIBS" | |
19 | + LIBS="-R $libdir $LIBS" | |
20 | AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no) | |
21 | LIBS=$SAVE_LIBS]) | |
22 | AC_MSG_RESULT([$php_cv_cc_dashr]) | |
23 | @@ -709,7 +709,7 @@ | |
24 | AC_MSG_CHECKING([if compiler supports -Wl,-rpath,]) | |
25 | AC_CACHE_VAL(php_cv_cc_rpath,[ | |
26 | SAVE_LIBS=$LIBS | |
27 | - LIBS="-Wl,-rpath,/usr/lib $LIBS" | |
28 | + LIBS="-Wl,-rpath,$libdir $LIBS" | |
29 | AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no) | |
30 | LIBS=$SAVE_LIBS]) | |
31 | AC_MSG_RESULT([$php_cv_cc_rpath]) | |
32 | @@ -893,7 +893,7 @@ | |
33 | dnl add a library to linkpath/runpath | |
34 | dnl | |
35 | AC_DEFUN([PHP_ADD_LIBPATH],[ | |
36 | - if test "$1" != "/usr/lib"; then | |
37 | + if test "$1" != "$libdir"; then | |
38 | PHP_EXPAND_PATH($1, ai_p) | |
39 | ifelse([$2],,[ | |
40 | _PHP_ADD_LIBPATH_GLOBAL([$ai_p]) |