cvs: php4(PHP_4_2_0) / acinclude.m4 /ext/iconv iconv.c

sniper Thu Mar 21 15:25:25 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4 acinclude.m4 /php4/ext/iconv iconv.c Log: - MFH iconv fixes. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.157.2.4 php4/acinclude.m4:1.157.2.5 --- php4/acinclude.m4:1.157.2.4 Wed Mar 20 14:00:35 2002 +++ php4/acinclude.m4 Thu Mar 21 15:25:24 2002 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.157.2.4 2002/03/20 19:00:35 sniper Exp $ +dnl $Id: acinclude.m4,v 1.157.2.5 2002/03/21 20:25:24 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -1200,17 +1200,28 @@ found_iconv=no unset ICONV_DIR - AC_CHECK_FUNC(iconv, [ - AC_DEFINE(HAVE_ICONV, 1, [ ]) - found_iconv=yes - ],[ - AC_CHECK_FUNC(libiconv,[ - AC_DEFINE(HAVE_LIBICONV, 1, [ ]) + dnl + dnl Check libc first if no path is provided in --with-iconv + dnl + if test "$PHP_ICONV" = "yes"; then + AC_CHECK_FUNC(iconv, [ found_iconv=yes - ],[ + ],[ + AC_CHECK_FUNC(libiconv,[ + AC_DEFINE(HAVE_LIBICONV, 1, [ ]) + found_iconv=yes + ]) + ]) + fi + dnl + dnl Check external libs for iconv funcs + dnl + if test "$found_iconv" = "no"; then + for i in $PHP_ICONV /usr/local /usr; do if test -r $i/include/giconv.h; then + AC_DEFINE(HAVE_GICONV_H, 1, [ ]) ICONV_DIR=$i iconv_lib_name=giconv break @@ -1218,11 +1229,11 @@ ICONV_DIR=$i iconv_lib_name=iconv break - fi + fi done if test -z "$ICONV_DIR"; then - AC_MSG_ERROR([Please specify the location of iconv with --with-iconv]) + AC_MSG_ERROR([Please specify the install prefix of iconv with --with-iconv=<DIR>]) fi if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a || @@ -1234,7 +1245,6 @@ ], [ PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [ found_iconv=yes - AC_DEFINE(HAVE_ICONV, 1, [ ]) ], [], [ -L$ICONV_DIR/lib ]) @@ -1242,11 +1252,11 @@ -L$ICONV_DIR/lib ]) fi - ]) - ]) - + fi + if test "$found_iconv" = "yes"; then 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 Index: php4/ext/iconv/iconv.c diff -u php4/ext/iconv/iconv.c:1.31.2.1 php4/ext/iconv/iconv.c:1.31.2.2 --- php4/ext/iconv/iconv.c:1.31.2.1 Sun Mar 10 18:00:35 2002 +++ php4/ext/iconv/iconv.c Thu Mar 21 15:25:25 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iconv.c,v 1.31.2.1 2002/03/10 23:00:35 mfischer Exp $ */ +/* $Id: iconv.c,v 1.31.2.2 2002/03/21 20:25:25 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,7 +27,12 @@ #if HAVE_ICONV +#ifdef HAVE_GICONV_H +#include <giconv.h> +#else #include <iconv.h> +#endif + #include <errno.h> #include "php_globals.h"