Re: cvs: php4(PHP_4_0_7) /ext/fdf Makefile.in /ext/gd config.m4 /ext/mbstring mbstring.c

Make sure you upate the NEWS file as well please. We need to make it very obvious what has changed between 4.1.1 and 4.1.2 On Sat, 23 Feb 2002, Rui Hirokawa wrote: > hirokawa Fri Feb 22 21:01:44 2002 EDT > > Modified files: (Branch: PHP_4_0_7) > /php4/ext/fdf Makefile.in > /php4/ext/gd config.m4 > /php4/ext/mbstring mbstring.c > Log: > > - fixed configuration problem as shared extension for fdf. > - fixed configuration problem as shared extension for gd with freetype1. > - default output encoding of mbstring changed to pass to fix initialization problem. > > Index: php4/ext/fdf/Makefile.in > diff -u php4/ext/fdf/Makefile.in:1.8 php4/ext/fdf/Makefile.in:1.8.8.1 > --- php4/ext/fdf/Makefile.in:1.8 Sun Nov 12 00:59:34 2000 > +++ php4/ext/fdf/Makefile.in Fri Feb 22 21:01:09 2002 > @@ -2,5 +2,6 @@ > LTLIBRARY_NAME = libfdf.la > LTLIBRARY_SOURCES = fdf.c > LTLIBRARY_SHARED_NAME = fdf.la > +LTLIBRARY_SHARED_LIBADD = $(FDFTK_SHARED_LIBADD) > > include $(top_srcdir)/build/dynlib.mk > Index: php4/ext/gd/config.m4 > diff -u php4/ext/gd/config.m4:1.71.2.2 php4/ext/gd/config.m4:1.71.2.3 > --- php4/ext/gd/config.m4:1.71.2.2 Thu Sep 6 20:28:26 2001 > +++ php4/ext/gd/config.m4 Fri Feb 22 21:01:14 2002 > @@ -1,5 +1,5 @@ > dnl > -dnl $Id: config.m4,v 1.71.2.2 2001/09/07 00:28:26 sniper Exp $ > +dnl $Id: config.m4,v 1.71.2.3 2002/02/23 02:01:14 hirokawa Exp $ > dnl > > AC_DEFUN(PHP_GD_JPEG,[ > @@ -112,6 +112,10 @@ > PHP_ARG_WITH(freetype-dir, for freetype(2), > [ --with-freetype-dir=DIR GD: Set the path to freetype2 install prefix.]) > > + if test "$PHP_TTF" != "no"; then > + PHP_FREETYPE_DIR="no" > + fi > + > if test "$PHP_FREETYPE_DIR" != "no"; then > for i in /usr /usr/local $PHP_FREETYPE_DIR; do > if test -f "$i/include/freetype2/freetype/freetype.h"; then > @@ -169,6 +173,8 @@ > ]) > > AC_DEFUN(PHP_GD_CHECK_VERSION,[ > + save_LIBS="$LIBS" > + LIBS="$GD_SHARED_LIBADD $LIBS" > AC_CHECK_LIB(gd, gdImageString16, [AC_DEFINE(HAVE_LIBGD13, 1, [ ])]) > AC_CHECK_LIB(gd, gdImagePaletteCopy, [AC_DEFINE(HAVE_LIBGD15, 1, [ ])]) > AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])]) > @@ -187,6 +193,7 @@ > AC_CHECK_LIB(gd, gdImageColorClosestHWB, [AC_DEFINE(HAVE_COLORCLOSESTHWB, 1, [ ])]) > AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE, 1, [ ])]) > AC_CHECK_LIB(gd, gdImageGifCtx, [AC_DEFINE(HAVE_GD_GIF_CTX, 1, [ ])]) > + LIBS=$save_LIBS > ]) > > > @@ -201,6 +208,7 @@ > PHP_SUBST(GD_SHARED_LIBADD) > > dnl Various checks for GD features > + PHP_SHLIB_SUFFIX_NAME > PHP_GD_TTSTR > PHP_GD_JPEG > PHP_GD_PNG > Index: php4/ext/mbstring/mbstring.c > diff -u php4/ext/mbstring/mbstring.c:1.28.2.3 php4/ext/mbstring/mbstring.c:1.28.2.4 > --- php4/ext/mbstring/mbstring.c:1.28.2.3 Mon Nov 12 09:51:39 2001 > +++ php4/ext/mbstring/mbstring.c Fri Feb 22 21:01:41 2002 > @@ -16,7 +16,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: mbstring.c,v 1.28.2.3 2001/11/12 14:51:39 hirokawa Exp $ */ > +/* $Id: mbstring.c,v 1.28.2.4 2002/02/23 02:01:41 hirokawa Exp $ */ > > /* > * PHP4 Multibyte String module "mbstring" (currently only for Japanese) > @@ -388,8 +388,8 @@ > pglobals->current_language = mbfl_no_language_japanese; > pglobals->internal_encoding = mbfl_no_encoding_euc_jp; > pglobals->current_internal_encoding = mbfl_no_encoding_euc_jp; > - pglobals->http_output_encoding = mbfl_no_encoding_invalid; > - pglobals->current_http_output_encoding = mbfl_no_encoding_invalid; > + pglobals->http_output_encoding = mbfl_no_encoding_pass; > + pglobals->current_http_output_encoding = mbfl_no_encoding_pass; > pglobals->http_input_identify = mbfl_no_encoding_invalid; > pglobals->http_input_identify_get = mbfl_no_encoding_invalid; > pglobals->http_input_identify_post = mbfl_no_encoding_invalid; > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php >