Re: cvs: php4 /ext/sablot config.m4 /ext/xslt config.m4

What happened? It used to work without the iconv library. And doesn't xslt just use sablot (which in turn would check for iconv?) Andi At 03:26 AM 5/1/2001 +0000, Sterling Hughes wrote:

sterling                Mon Apr 30 20:26:03 2001 EDT

Modified files:

    /php4/ext/sablot    config.m4
    /php4/ext/xslt      config.m4

Log: Check for the existance of the iconv library # Not sure if this is correct, I can verify that it doesn't break anything # and it logically looks like it would work. Can someone test this (BSD # and/or Windows) Index: php4/ext/sablot/config.m4 diff -u php4/ext/sablot/config.m4:1.14 php4/ext/sablot/config.m4:1.15

--- php4/ext/sablot/config.m4:1.14      Tue Mar 27 12:34:42 2001

+++ php4/ext/sablot/config.m4 Mon Apr 30 20:26:03 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.14 2001/03/27 20:34:42 sniper Exp $ +dnl $Id: config.m4,v 1.15 2001/05/01 03:26:03 sterling Exp $ dnl config.m4 for extension Sablot PHP_ARG_WITH(expat-dir, for Sablotron XSL support, @@ -49,6 +49,24 @@

     PHP_ADD_LIBRARY(xmlparse)
     PHP_ADD_LIBRARY(xmltok)

fi + + 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
+       if test -f $i/lib/libconv.a -o -f $i/lib/libiconv.so; then
+         PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib)
+         found_iconv=yes
+       fi
+      done
+    fi

+ fi +

+    if test "$found_iconv" = "no"; then
+      AC_MSG_ERROR(iconv not found, in order to build sablotron you need the iconv library)
+    fi

+ AC_DEFINE(HAVE_SABLOT,1,[ ]) Index: php4/ext/xslt/config.m4 diff -u php4/ext/xslt/config.m4:1.1 php4/ext/xslt/config.m4:1.2 --- php4/ext/xslt/config.m4:1.1 Wed Apr 25 17:13:25 2001

+++ php4/ext/xslt/config.m4     Mon Apr 30 20:26:03 2001

@@ -3,7 +3,7 @@ dnl | This is where the magic of the extension reallly is. Depending

on what     |
 dnl |  backend the user chooses, this script performs the magic                    |
 dnl +------------------------------------------------------------------------------+

-dnl $Id: config.m4,v 1.1 2001/04/26 00:13:25 sterling Exp $ +dnl $Id: config.m4,v 1.2 2001/05/01 03:26:03 sterling Exp $ PHP_ARG_ENABLE(xslt, whether to enable xslt support,

 [  --enable-xslt           Enable xslt support])

@@ -72,6 +72,23 @@

                        PHP_ADD_LIBRARY(xmltok)
                fi

+               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
+                                       if test -f $i/lib/libconv.a -o -f $i/lib/libiconv.so; then
+ PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib)
+                                               found_iconv=yes
+                                       fi
+                               done
+                       fi
+               fi

+

+               if test "$found_iconv" = "no"; then
+                       AC_MSG_ERROR(iconv not found, in order to build sablotron you need the iconv library)
+               fi

+

                AC_DEFINE(HAVE_SABLOT, 1, [ ])
                AC_CHECK_LIB(sablot, SablotSetEncoding, AC_DEFINE(HAVE_SABLOT_SET_ENCODING, 1, [ ]))
        fi

-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: php-cvs-unsubscribe@lists.php.net For additional commands, e-mail: php-cvs-help@lists.php.net To contact the list administrators, e-mail: php-list-admin@lists.php.net