sniper Fri Oct 11 11:25:36 2002 EDT
Modified files:
/php4/ext/iconv config.m4
Log:
ws fix
Index: php4/ext/iconv/config.m4
diff -u php4/ext/iconv/config.m4:1.15 php4/ext/iconv/config.m4:1.16
--- php4/ext/iconv/config.m4:1.15 Fri Oct 11 03:50:47 2002
+++ php4/ext/iconv/config.m4 Fri Oct 11 11:25:36 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.15 2002/10/11 07:50:47 moriyoshi Exp $
+dnl $Id: config.m4,v 1.16 2002/10/11 15:25:36 sniper Exp $
dnl
PHP_ARG_WITH(iconv, for iconv support,
@@ -43,24 +43,26 @@
icv_close( cd );
return 2;
}
-],[
- AC_MSG_RESULT(yes)
- PHP_DEFINE([ICONV_SUPPORTS_ERRNO],1)
- AC_DEFINE([ICONV_SUPPORTS_ERRNO],1,[Whether iconv supports error no or not])
-],[
- PHP_DEFINE([ICONV_SUPPORTS_ERRNO],0)
- AC_DEFINE([ICONV_SUPPORTS_ERRNO],0,[Whether iconv supports error no or not])
- AC_MSG_RESULT(no)
-])
- if test -z "$iconv_lib_name"; then
- AC_MSG_CHECKING([if iconv is glibc's])
- AC_TRY_COMPILE([#include <iconv.h>],[void __gconv(); int main() { __gconv(); }
],[
+ ],[
AC_MSG_RESULT(yes)
- PHP_DEFINE([ICONV_IMPL],["glibc"])
- AC_DEFINE([ICONV_IMPL],["glibc"],[Which iconv implementation to use])
-],[
+ PHP_DEFINE([ICONV_SUPPORTS_ERRNO],1)
+ AC_DEFINE([ICONV_SUPPORTS_ERRNO],1,[Whether iconv supports error no or not])
+ ],[
AC_MSG_RESULT(no)
-])
+ PHP_DEFINE([ICONV_SUPPORTS_ERRNO],0)
+ AC_DEFINE([ICONV_SUPPORTS_ERRNO],0,[Whether iconv supports error no or not])
+ ])
+
+ if test -z "$iconv_lib_name"; then
+ AC_MSG_CHECKING([if iconv is glibc's])
+ AC_TRY_COMPILE([#include <iconv.h>],[void __gconv(); int main() { __gconv(); }],
+ [
+ AC_MSG_RESULT(yes)
+ PHP_DEFINE([ICONV_IMPL],["glibc"])
+ AC_DEFINE([ICONV_IMPL],["glibc"],[Which iconv implementation to use])
+ ],[
+ AC_MSG_RESULT(no)
+ ])
else
case "$iconv_lib_name" in
iconv [)]
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
