cvs: php4(PHP_4_0_7) /ext/domxml config.m4 /ext/gd config.m4 gd.c /ext/iconv config.m4 /ext/oci8 config.m4 /ext/oracle config.m4 /ext/sablot
config.m4 /ext/snmp config.m4 /ext/xml config.m4

sniper Thu Sep 6 20:28:28 2001 EDT Modified files: (Branch: PHP_4_0_7) /php4/ext/domxml config.m4 /php4/ext/gd config.m4 gd.c /php4/ext/iconv config.m4 /php4/ext/oci8 config.m4 /php4/ext/oracle config.m4 /php4/ext/sablot config.m4 /php4/ext/snmp config.m4 /php4/ext/xml config.m4 Log: MFH

Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.26.2.1 php4/ext/domxml/config.m4:1.26.2.2 --- php4/ext/domxml/config.m4:1.26.2.1 Sat Aug 18 17:09:41 2001 +++ php4/ext/domxml/config.m4 Thu Sep 6 20:28:26 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26.2.1 2001/08/18 21:09:41 sniper Exp $ +dnl $Id: config.m4,v 1.26.2.2 2001/09/07 00:28:26 sniper Exp $ dnl config.m4 for extension domxml AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -40,7 +40,7 @@ PHP_DOM_CHECK_VERSION - if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.s? ; then + if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then DOM_LIBNAME=xml2 else DOM_LIBNAME=xml Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.71.2.1 php4/ext/gd/config.m4:1.71.2.2 --- php4/ext/gd/config.m4:1.71.2.1 Fri Aug 24 16:07:07 2001 +++ php4/ext/gd/config.m4 Thu Sep 6 20:28:26 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.71.2.1 2001/08/24 20:07:07 sniper Exp $ +dnl $Id: config.m4,v 1.71.2.2 2001/09/07 00:28:26 sniper Exp $ dnl AC_DEFUN(PHP_GD_JPEG,[ @@ -9,7 +9,7 @@ if test "$PHP_JPEG_DIR" != "no"; then for i in /usr /usr/local $PHP_JPEG_DIR; do - test -f "$i/lib/libjpeg.s?" -o -f "$i/lib/libjpeg.a" && GD_JPEG_DIR=$i + test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i done AC_CHECK_LIB(jpeg,jpeg_read_header, @@ -32,7 +32,7 @@ if test "$PHP_PNG_DIR" != "no"; then for i in /usr /usr/local $PHP_PNG_DIR; do - test -f "$i/lib/libpng.s?" -o -f "$i/lib/libpng.a" && GD_PNG_DIR=$i + test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i done if test "$PHP_ZLIB_DIR" = "no"; then @@ -59,7 +59,7 @@ if test "$PHP_XPM_DIR" != "no"; then for i in /usr /usr/local /usr/X11R6 $PHP_XPM_DIR; do - test -f "$i/lib/libXpm.s?" -o -f "$i/lib/libXpm.a" && GD_XPM_DIR=$i + test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i done AC_CHECK_LIB(Xpm,XpmFreeXpmImage, @@ -181,6 +181,8 @@ AC_CHECK_LIB(gd, gdImageCreateTrueColor, [AC_DEFINE(HAVE_LIBGD20, 1, [ ])]) AC_CHECK_LIB(gd, gdImageSetTile, [AC_DEFINE(HAVE_GD_IMAGESETTILE, 1, [ ])]) AC_CHECK_LIB(gd, gdImageSetBrush, [AC_DEFINE(HAVE_GD_IMAGESETBRUSH, 1, [ ])]) + AC_CHECK_LIB(gd, gdImageStringTTF, [AC_DEFINE(HAVE_GD_STRINGTTF, 1, [ ])]) + AC_CHECK_LIB(gd, gdImageStringFT, [AC_DEFINE(HAVE_GD_STRINGFT, 1, [ ])]) AC_CHECK_LIB(gd, gdImageStringFTEx, [AC_DEFINE(HAVE_GD_STRINGFTEX, 1, [ ])]) AC_CHECK_LIB(gd, gdImageColorClosestHWB, [AC_DEFINE(HAVE_COLORCLOSESTHWB, 1, [ ])]) AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE, 1, [ ])]) @@ -220,7 +222,7 @@ done for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do - test -f $PHP_GD/$i/libgd.s? -o -f $PHP_GD/$i/libgd.a && GD_LIB=$PHP_GD/$i + test -f $PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME -o -f $PHP_GD/$i/libgd.a && GD_LIB=$PHP_GD/$i done if test -n "$GD_INCLUDE" && test -n "$GD_LIB" ; then Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.154.2.2 php4/ext/gd/gd.c:1.154.2.3 --- php4/ext/gd/gd.c:1.154.2.2 Sat Aug 25 21:12:07 2001 +++ php4/ext/gd/gd.c Thu Sep 6 20:28:26 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.154.2.2 2001/08/26 01:12:07 rasmus Exp $ */ +/* $Id: gd.c,v 1.154.2.3 2001/09/07 00:28:26 sniper Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -2610,7 +2610,6 @@ /* }}} */ - /* {{{ proto array imagettfbbox(int size, int angle, string font_file, string text) Give the bounding box of a text using TrueType fonts */ PHP_FUNCTION(imagettfbbox) @@ -2640,8 +2639,7 @@ #ifdef ENABLE_GD_TTF /* {{{ php_imagettftext_common */ -static -void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int extended) +static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int extended) { zval **IM, **PTSIZE, **ANGLE, **X, **Y, **C, **FONTNAME, **COL, **EXT = NULL; gdImagePtr im=NULL; @@ -2739,22 +2737,26 @@ fontname = (unsigned char*)Z_STRVAL_PP(FONTNAME); #endif -#ifdef USE_GD_IMGSTRTTF -# if HAVE_LIBFREETYPE -#if HAVE_GD_STRINGFTEX +#ifdef USE_GD_IMGSTRTTF +# if HAVE_GD_STRINGFTEX if (extended) { error = gdImageStringFTEx(im, brect, col, fontname, ptsize, angle, x, y, str, &strex); } else -#endif +# endif +# if HAVE_GD_STRINGFT error = gdImageStringFT(im, brect, col, fontname, ptsize, angle, x, y, str); -# else +# endif + +# if HAVE_GD_STRINGTTF error = gdImageStringTTF(im, brect, col, fontname, ptsize, angle, x, y, str); # endif -#else + +#else /* !USE_GD_IMGSTRTTF */ error = gdttf(im, brect, col, fontname, ptsize, angle, x, y, str); #endif + if (error) { php_error(E_WARNING, "%s", error); Index: php4/ext/iconv/config.m4 diff -u php4/ext/iconv/config.m4:1.4.2.1 php4/ext/iconv/config.m4:1.4.2.2 --- php4/ext/iconv/config.m4:1.4.2.1 Fri Aug 17 02:55:38 2001 +++ php4/ext/iconv/config.m4 Thu Sep 6 20:28:27 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4.2.1 2001/08/17 06:55:38 sniper Exp $ +dnl $Id: config.m4,v 1.4.2.2 2001/09/07 00:28:27 sniper Exp $ dnl config.m4 for extension iconv PHP_ARG_WITH(iconv, for iconv support, @@ -14,7 +14,7 @@ AC_MSG_ERROR(Please reinstall the iconv library.) fi - if test -f $ICONV_DIR/lib/libconv.a -o -f $ICONV_DIR/lib/libiconv.s? ; then + if test -f $ICONV_DIR/lib/libconv.a -o -f $ICONV_DIR/lib/libiconv.$SHLIB_SUFFIX_NAME ; then PHP_ADD_LIBRARY_WITH_PATH(iconv, $ICONV_DIR/lib, ICONV_SHARED_LIBADD) AC_CHECK_LIB(iconv, libiconv_open, [ AC_DEFINE(HAVE_ICONV, 1, [ ]) Index: php4/ext/oci8/config.m4 diff -u php4/ext/oci8/config.m4:1.31 php4/ext/oci8/config.m4:1.31.2.1 --- php4/ext/oci8/config.m4:1.31 Thu Jul 26 19:07:45 2001 +++ php4/ext/oci8/config.m4 Thu Sep 6 20:28:27 2001 @@ -1,15 +1,15 @@ -dnl $Id: config.m4,v 1.31 2001/07/26 23:07:45 thies Exp $ +dnl $Id: config.m4,v 1.31.2.1 2001/09/07 00:28:27 sniper Exp $ AC_DEFUN(AC_OCI8_VERSION,[ AC_MSG_CHECKING([Oracle version]) if test -s "$OCI8_DIR/orainst/unix.rgs"; then OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4` test -z "$OCI8_VERSION" && OCI8_VERSION=7.3 - elif test -f $OCI8_DIR/lib/libclntsh.s?.9.0; then + elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then OCI8_VERSION=9.0 - elif test -f $OCI8_DIR/lib/libclntsh.s?.8.0; then + elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then OCI8_VERSION=8.1 - elif test -f $OCI8_DIR/lib/libclntsh.s?.1.0; then + elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then OCI8_VERSION=8.0 elif test -f $OCI8_DIR/lib/libclntsh.a; then if test -f $OCI8_DIR/lib/libcore4.a; then Index: php4/ext/oracle/config.m4 diff -u php4/ext/oracle/config.m4:1.25 php4/ext/oracle/config.m4:1.25.2.1 --- php4/ext/oracle/config.m4:1.25 Sat Jun 23 06:20:58 2001 +++ php4/ext/oracle/config.m4 Thu Sep 6 20:28:27 2001 @@ -1,13 +1,13 @@ -dnl $Id: config.m4,v 1.25 2001/06/23 10:20:58 sniper Exp $ +dnl $Id: config.m4,v 1.25.2.1 2001/09/07 00:28:27 sniper Exp $ AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([Oracle version]) if test -s "$ORACLE_DIR/orainst/unix.rgs"; then ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4` test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3 - elif test -f $ORACLE_DIR/lib/libclntsh.s?.8.0; then + elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then ORACLE_VERSION=8.1 - elif test -f $ORACLE_DIR/lib/libclntsh.s?.1.0; then + elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then ORACLE_VERSION=8.0 elif test -f $ORACLE_DIR/lib/libclntsh.a; then if test -f $ORACLE_DIR/lib/libcore4.a; then @@ -56,7 +56,7 @@ AC_ORACLE_VERSION($ORACLE_DIR) case $ORACLE_VERSION in 7.0|7.1) - if test -f $ORACLE_DIR/lib/liboracle.s?; then + if test -f $ORACLE_DIR/lib/liboracle.$SHLIB_SUFFIX_NAME; then PHP_ADD_LIBRARY_WITH_PATH(oracle, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) else PHP_ADD_LIBRARY_WITH_PATH(core, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) @@ -85,7 +85,7 @@ ;; 7.2) - if test -f $ORACLE_DIR/lib/libclntsh.s?; then + if test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME; then PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) else PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) @@ -106,7 +106,7 @@ ;; 7.3) - if test -f $ORACLE_DIR/lib/libclntsh.s?; then + if test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME; then PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) else PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) Index: php4/ext/sablot/config.m4 diff -u php4/ext/sablot/config.m4:1.20.2.1 php4/ext/sablot/config.m4:1.20.2.2 --- php4/ext/sablot/config.m4:1.20.2.1 Fri Aug 17 12:42:58 2001 +++ php4/ext/sablot/config.m4 Thu Sep 6 20:28:27 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.20.2.1 2001/08/17 16:42:58 sniper Exp $ +dnl $Id: config.m4,v 1.20.2.2 2001/09/07 00:28:27 sniper Exp $ dnl config.m4 for extension Sablot PHP_ARG_WITH(sablot, for Sablotron XSL support, @@ -32,7 +32,7 @@ testval=no for i in $PHP_EXPAT_DIR $SABLOT_DIR; do - if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.s?; then + if test -f $i/lib/libexpat.a" -o -f "$i/lib/libexpat.$SHLIB_SUFFIX_NAME; then AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, SABLOT_SHARED_LIBADD) PHP_ADD_INCLUDE($i/include) @@ -53,7 +53,7 @@ AC_CHECK_LIB(c, iconv_open, found_iconv=yes) if test "$found_iconv" = "no"; then for i in /usr /usr/local $ICONV_DIR; do - if test -f $i/lib/libconv.a -o -f $i/lib/libiconv.s?; then + if test -f $i/lib/libconv.a -o -f $i/lib/libiconv.$SHLIB_SUFFIX_NAME; then PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib, SABLOT_SHARED_LIBADD) found_iconv=yes fi Index: php4/ext/snmp/config.m4 diff -u php4/ext/snmp/config.m4:1.20.2.1 php4/ext/snmp/config.m4:1.20.2.2 --- php4/ext/snmp/config.m4:1.20.2.1 Mon Aug 20 10:08:04 2001 +++ php4/ext/snmp/config.m4 Thu Sep 6 20:28:27 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.20.2.1 2001/08/20 14:08:04 sniper Exp $ +dnl $Id: config.m4,v 1.20.2.2 2001/09/07 00:28:27 sniper Exp $ dnl PHP_ARG_WITH(snmp,for SNMP support, @@ -19,7 +19,7 @@ test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp done for i in /usr /usr/snmp /usr/local /usr/local/snmp; do - test -f $i/lib/libsnmp.a -o -f $i/lib/libsnmp.s? && SNMP_LIBDIR=$i/lib + test -f $i/lib/libsnmp.a -o -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib done else SNMP_INCDIR=$PHP_SNMP/include Index: php4/ext/xml/config.m4 diff -u php4/ext/xml/config.m4:1.31 php4/ext/xml/config.m4:1.31.2.1 --- php4/ext/xml/config.m4:1.31 Sun Jun 3 13:11:05 2001 +++ php4/ext/xml/config.m4 Thu Sep 6 20:28:27 2001 @@ -1,5 +1,5 @@ # $Source: /usr/repository/php4/ext/xml/config.m4,v $ -# $Id: config.m4,v 1.31 2001/06/03 17:11:05 sas Exp $ +# $Id: config.m4,v 1.31.2.1 2001/09/07 00:28:27 sniper Exp $ dnl Fallback for --with-xml[=DIR] AC_ARG_WITH(xml,[],enable_xml=$withval) @@ -42,7 +42,7 @@ AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) for i in $PHP_XML $PHP_EXPAT_DIR; do - if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.s? ; then + if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then EXPAT_DIR=$i fi done