cvs: php4(PHP_4_2_0) / acinclude.m4 /ext/iconv config.m4 /ext/xmlrpc config.m4 /ext/xslt config.m4

ssb Mon Mar 18 20:08:18 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4 acinclude.m4 /php4/ext/iconv config.m4 /php4/ext/xslt config.m4 /php4/ext/xmlrpc config.m4 Log: MFH: Jani's fix to my iconv fix Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.157 php4/acinclude.m4:1.157.2.1 --- php4/acinclude.m4:1.157 Wed Feb 20 21:12:37 2002 +++ php4/acinclude.m4 Mon Mar 18 20:08:14 2002 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.157 2002/02/21 02:12:37 elixer Exp $ +dnl $Id: acinclude.m4,v 1.157.2.1 2002/03/19 01:08:14 ssb Exp $ dnl dnl This file contains local autoconf functions. @@ -1191,4 +1191,54 @@ ]) +dnl +dnl PHP_SETUP_ICONV(shared-add [, action-found [, action-not-found]]) +dnl +dnl Common setup macro for iconv +dnl +AC_DEFUN(PHP_SETUP_ICONV, [ + found_iconv=no + + AC_CHECK_LIB(c, iconv_open, [ + AC_DEFINE(HAVE_ICONV, 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 + ICONV_DIR=$i + if test -r $i/include/giconv.h; then + iconv_lib_name=giconv + fi + break + fi + done + + if test -z "$ICONV_DIR"; then + 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 + then + PHP_CHECK_LIBRARY($iconv_lib_name, libiconv_open, [ + 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 + ], [ + -L$ICONV_DIR/lib + ]) + fi + ]) + if test "$found_iconv" = "no"; then + $3 + else + $2 + PHP_ADD_INCLUDE($ICONV_DIR/include) + fi +]) Index: php4/ext/iconv/config.m4 diff -u php4/ext/iconv/config.m4:1.8.2.2 php4/ext/iconv/config.m4:1.8.2.3 --- php4/ext/iconv/config.m4:1.8.2.2 Fri Mar 15 09:15:04 2002 +++ php4/ext/iconv/config.m4 Mon Mar 18 20:08:15 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8.2.2 2002/03/15 14:15:04 ssb Exp $ +dnl $Id: config.m4,v 1.8.2.3 2002/03/19 01:08:15 ssb Exp $ dnl PHP_ARG_WITH(iconv, for iconv support, @@ -7,34 +7,11 @@ if test "$PHP_ICONV" != "no"; then - 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 - ICONV_DIR=$i - if test -r $i/include/giconv.h; then - iconv_lib_name=giconv - fi - break - fi - done - - if test -z "$ICONV_DIR"; then + PHP_SETUP_ICONV(ICONV_SHARED_LIBADD, [ + PHP_EXTENSION(iconv, $ext_shared) + PHP_SUBST(ICONV_SHARED_LIBADD) + ], [ AC_MSG_ERROR(Please reinstall the iconv library.) - fi - - 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_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, ICONV_SHARED_LIBADD) - AC_CHECK_LIB($iconv_lib_name, libiconv_open, [ - AC_DEFINE(HAVE_ICONV, 1, [ ]) - AC_DEFINE(HAVE_LIBICONV, 1, [ ]) - ]) - else - AC_CHECK_LIB(c, iconv_open, AC_DEFINE(HAVE_ICONV, 1, [ ])) - fi - - PHP_ADD_INCLUDE($ICONV_DIR/include) - PHP_EXTENSION(iconv, $ext_shared) - PHP_SUBST(ICONV_SHARED_LIBADD) + ]) + fi Index: php4/ext/xslt/config.m4 diff -u php4/ext/xslt/config.m4:1.14.2.2 php4/ext/xslt/config.m4:1.14.2.3 --- php4/ext/xslt/config.m4:1.14.2.2 Fri Mar 15 09:16:50 2002 +++ php4/ext/xslt/config.m4 Mon Mar 18 20:08:16 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.14.2.2 2002/03/15 14:16:50 ssb Exp $ +dnl $Id: config.m4,v 1.14.2.3 2002/03/19 01:08:16 ssb Exp $ dnl dnl +------------------------------------------------------------------------------+ dnl | This is where the magic of the extension reallly is. Depending on what | @@ -69,28 +69,9 @@ PHP_ADD_LIBRARY(xmltok) fi - found_iconv=no - - if test -z "$ICONV_DIR"; then - 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 - then - PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, XSLT_SHARED_LIBADD) - AC_CHECK_LIB($iconv_lib_name, libiconv_open, [ - found_iconv=yes - ]) - else - AC_CHECK_LIB(c, iconv_open, [ - found_iconv=yes - ]) - fi - - if test "$found_iconv" = "no"; then + PHP_SETUP_ICONV(XSLT_SHARED_LIBADD, [], [ AC_MSG_ERROR([iconv not found, in order to build sablotron you need the iconv library]) - fi + ]) if test "$PHP_SABLOT_JS" != "no"; then found_js=no Index: php4/ext/xmlrpc/config.m4 diff -u php4/ext/xmlrpc/config.m4:1.8.2.2 php4/ext/xmlrpc/config.m4:1.8.2.3 --- php4/ext/xmlrpc/config.m4:1.8.2.2 Fri Mar 15 09:16:50 2002 +++ php4/ext/xmlrpc/config.m4 Mon Mar 18 20:08:17 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8.2.2 2002/03/15 14:16:50 ssb Exp $ +dnl $Id: config.m4,v 1.8.2.3 2002/03/19 01:08:17 ssb Exp $ dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) @@ -33,29 +33,9 @@ AC_MSG_ERROR(XML-RPC support requires libexpat. Use --with-expat-dir=<DIR>) fi - found_iconv=no - - if test -z "$ICONV_DIR"; then - 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 - then - PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, XMLRPC_SHARED_LIBADD) - AC_CHECK_LIB($iconv_lib_name, libiconv_open, [ - found_iconv=yes - ]) - else - AC_CHECK_LIB(c, iconv_open, [ - found_iconv=yes - ]) - fi - - if test "$found_iconv" = "no"; then + PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) - fi - + ]) fi