*** php-4.1.1/ext/gd/config.m4.orig	Fri Sep  7 09:28:26 2001
--- php-4.1.1/ext/gd/config.m4	Thu Feb 14 00:12:22 2002
***************
*** 112,117 ****
--- 112,121 ----
    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,174 ****
--- 173,180 ----
  ])
  
  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,192 ****
--- 193,199 ----
    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,206 ****
--- 208,214 ----
    PHP_SUBST(GD_SHARED_LIBADD)
  
  dnl Various checks for GD features
+   PHP_SHLIB_SUFFIX_NAME
    PHP_GD_TTSTR
    PHP_GD_JPEG
    PHP_GD_PNG