cvs: php4(PHP_4_2_0) / acinclude.m4 /ext/vpopmail config.m4

derick Wed Mar 20 13:16:06 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4 acinclude.m4 /php4/ext/vpopmail config.m4 Log: - MFH iconv fix - Configure Fix for vpopmail Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.157.2.2 php4/acinclude.m4:1.157.2.3 --- php4/acinclude.m4:1.157.2.2 Tue Mar 19 17:40:29 2002 +++ php4/acinclude.m4 Wed Mar 20 13:16:04 2002 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.157.2.2 2002/03/19 22:40:29 sniper Exp $ +dnl $Id: acinclude.m4,v 1.157.2.3 2002/03/20 18:16:04 derick Exp $ dnl dnl This file contains local autoconf functions. @@ -1198,47 +1198,57 @@ dnl AC_DEFUN(PHP_SETUP_ICONV, [ found_iconv=no - - AC_CHECK_FUNCS(iconv libiconv, [ + unset ICONV_DIR + + AC_CHECK_FUNC(iconv, [ AC_DEFINE(HAVE_ICONV, 1, [ ]) found_iconv=yes - ], [ + ],[ + AC_CHECK_FUNC(libiconv,[ + AC_DEFINE(HAVE_LIBICONV, 1, [ ]) + found_iconv=yes + ],[ - iconv_lib_name=iconv for i in $PHP_ICONV /usr/local /usr; do - if test -r $i/include/giconv.h || test -r $i/include/iconv.h; then + if test -r $i/include/giconv.h; then ICONV_DIR=$i - if test -r $i/include/giconv.h; then - iconv_lib_name=giconv - fi + iconv_lib_name=giconv break - fi + elif test -r $i/include/iconv.h; then + ICONV_DIR=$i + iconv_lib_name=iconv + break + 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 location of iconv with --with-iconv]) fi - if test -f $ICONV_DIR/lib/lib${iconv_lib_name}.a || - test -f $ICONV_DIR/lib/lib${iconv_lib_name}.$SHLIB_SUFFIX_NAME + if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a || + test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME then PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [ found_iconv=yes - PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1) - AC_DEFINE(HAVE_ICONV, 1, [ ]) AC_DEFINE(HAVE_LIBICONV, 1, [ ]) ], [ - found_iconv=no + PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [ + found_iconv=yes + AC_DEFINE(HAVE_ICONV, 1, [ ]) + ]) ], [ -L$ICONV_DIR/lib ]) fi ]) + ]) - if test "$found_iconv" = "no"; then - $3 - else + if test "$found_iconv" = "yes"; then + if test -n "$ICONV_DIR"; then + PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1) + PHP_ADD_INCLUDE($ICONV_DIR/include) + fi $2 - PHP_ADD_INCLUDE($ICONV_DIR/include) +ifelse([$3],[],,[else $3]) fi ]) Index: php4/ext/vpopmail/config.m4 diff -u php4/ext/vpopmail/config.m4:1.9.2.1 php4/ext/vpopmail/config.m4:1.9.2.2 --- php4/ext/vpopmail/config.m4:1.9.2.1 Wed Mar 20 02:53:26 2002 +++ php4/ext/vpopmail/config.m4 Wed Mar 20 13:16:06 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.9.2.1 2002/03/20 07:53:26 mfischer Exp $ +dnl $Id: config.m4,v 1.9.2.2 2002/03/20 18:16:06 derick Exp $ dnl PHP_ARG_WITH(vpopmail, for vpopmail support, @@ -90,5 +90,5 @@ fi AC_DEFINE_UNQUOTED(HAVE_VPOPMAIL_API,$vpopmail_internal_api,[Interal definition for vpopmail API changes]) - PHP_NEW_EXTENSION(vpopmail, php_vpopmail.c, $ext_shared) + PHP_EXTENSION(vpopmail, $ext_shared) fi