Rui Hirokawa · Rui Hirokawa · commit bb369d7f91de · 2002-02-23T02:01:41.000Z
- 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.
diff --git a/ext/fdf/Makefile.in b/ext/fdf/Makefile.in
@@ -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
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
@@ -112,6 +112,10 @@ AC_DEFUN(PHP_GD_FREETYPE2,[
   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_TTSTR,[
 ])
 
 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_DEFUN(PHP_GD_CHECK_VERSION,[
   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 @@ if test "$PHP_GD" != "no"; then
   PHP_SUBST(GD_SHARED_LIBADD)
 
 dnl Various checks for GD features
+  PHP_SHLIB_SUFFIX_NAME
   PHP_GD_TTSTR
   PHP_GD_JPEG
   PHP_GD_PNG
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
@@ -388,8 +388,8 @@ php_mbstring_init_globals(zend_mbstring_globals *pglobals)
 	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;
