Look for iconv library also in $ICONV_DIR.

diff --git a/ext/sablot/config.m4 b/ext/sablot/config.m4
index e719434123fc92467e337dc864a736a35e10a487..12ef1c69a274204b7b5d0865adef38d197adcd9a 100644 (file)
--- 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 024ea0fa4b1f9056c378887c071b874b4ad483dc..2768ebd941078ad61271a4fe3a525493c00c28a2 100644 (file)
--- 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