diff options
| author | foobar <sniper@php.net> | 2001-08-17 08:33:49 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-08-17 08:33:49 +0000 |
| commit | 8f6394365ce8a22538a65df887df23940397cf10 (patch) | |
| tree | 9ecaf37d41001370073556b6ce5ac04a42c85e38 | |
| parent | feff3512f417f20e6acbac31521cde3c61445d13 (diff) | |
| download | php-git-8f6394365ce8a22538a65df887df23940397cf10.tar.gz | |
Look for iconv library also in $ICONV_DIR.
| -rw-r--r-- | ext/sablot/config.m4 | 6 | ||||
| -rw-r--r-- | ext/xslt/config.m4 | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/ext/sablot/config.m4 b/ext/sablot/config.m4 index e719434123..12ef1c69a2 100644 --- a/ext/sablot/config.m4 +++ b/ext/sablot/config.m4 @@ -52,14 +52,12 @@ if test "$PHP_SABLOT" != "no"; then found_iconv=no AC_CHECK_LIB(c, iconv_open, found_iconv=yes) if test "$found_iconv" = "no"; then - if test "$PHP_ICONV" = "no"; then - for i in /usr /usr/local; do + for i in /usr /usr/local $ICONV_DIR; do if test -f $i/lib/libconv.a -o -f $i/lib/libiconv.s?; then - PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib) + PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib, SABLOT_SHARED_LIBADD) found_iconv=yes fi done - fi fi if test "$found_iconv" = "no"; then diff --git a/ext/xslt/config.m4 b/ext/xslt/config.m4 index 024ea0fa4b..2768ebd941 100644 --- a/ext/xslt/config.m4 +++ b/ext/xslt/config.m4 @@ -68,14 +68,12 @@ if test "$PHP_XSLT" != "no"; then found_iconv=no AC_CHECK_LIB(c, iconv_open, found_iconv=yes) if test "$found_iconv" = "no"; then - if test "$PHP_ICONV" = "no"; then - for i in /usr /usr/local; do + for i in /usr /usr/local $ICONV_DIR; do if test -f $i/lib/libconv.a -o -f $i/lib/libiconv.so; then - PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib) + PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib, XSLT_SHARED_LIBADD) found_iconv=yes fi done - fi fi if test "$found_iconv" = "no"; then |