cvs: php4(PHP_4_2_0) / acinclude.m4
| From: | Jani Taskinen | Date: | Sun, 28 Apr 2002 01:40:05 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) / acinclude.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11484@lists.php.net to get a copy of this message | ||
sniper Sat Apr 27 21:40:05 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4 acinclude.m4
Log:
Fix bug: #16823
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.157.2.5 php4/acinclude.m4:1.157.2.6
--- php4/acinclude.m4:1.157.2.5 Thu Mar 21 15:25:24 2002
+++ php4/acinclude.m4 Sat Apr 27 21:40:05 2002
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.157.2.5 2002/03/21 20:25:24 sniper Exp $
+dnl $Id: acinclude.m4,v 1.157.2.6 2002/04/28 01:40:05 sniper Exp $
dnl
dnl This file contains local autoconf functions.
@@ -1255,8 +1255,8 @@
fi
if test "$found_iconv" = "yes"; then
+ AC_DEFINE(HAVE_ICONV, 1, [ ])
if test -n "$ICONV_DIR"; then
- AC_DEFINE(HAVE_ICONV, 1, [ ])
PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1)
PHP_ADD_INCLUDE($ICONV_DIR/include)
fi