From: foobar <sniper@php.net>
Date: Fri, 4 May 2007 21:57:22 +0000 (+0000)
Subject: - Prevent bugs like #41265 being submitted from now on.
X-Git-Tag: RELEASE_1_2_0~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=495ce1d791db5af4017c7a124dfdb79f154fc6cf;p=php

- Prevent bugs like #41265 being submitted from now on.
---

diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 6df2caf07a..743f8485d4 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -175,7 +175,12 @@ AC_DEFUN([PHP_GD_FREETYPE2],
       fi
     done
 
-    if test -n "$FREETYPE2_DIR" ; then
+    if test -z "$FREETYPE2_DIR"; then
+      AC_MSG_ERROR([freetype.h not found.])
+    fi
+ 
+    PHP_CHECK_LIBRARY(freetype, FT_New_Face,
+    [
       PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
       PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
       PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
@@ -184,9 +189,13 @@ AC_DEFUN([PHP_GD_FREETYPE2],
       AC_DEFINE(HAVE_GD_STRINGFT,   1, [ ])
       AC_DEFINE(HAVE_GD_STRINGFTEX, 1, [ ])
       GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBFREETYPE"
-    else
-      AC_MSG_ERROR([freetype2 not found!])
-    fi
+    ],[
+      AC_MSG_ERROR([Problem with freetype.(a|so). Please check config.log for more information.])
+    ],[
+      -L$FREETYPE2_DIR/$PHP_LIBDIR
+    ])
+  else
+    AC_MSG_RESULT([If configure fails try --with-freetype-dir=<DIR>])
   fi
 ])
 
@@ -371,6 +380,10 @@ dnl T1LIB support is gdlib independent
     GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS"
     PHP_ADD_BUILD_DIR($ext_builddir/libgd)
     GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/"
+
+    PHP_TEST_BUILD(foobar, [], [
+      AC_MSG_ERROR([GD build test failed. Please check the config.log for details.])
+    ], [ -L$GD_LIB $GD_SHARED_LIBADD ], [char foobar () {}])
   else
     GD_INCDIR=`$GDLIB_CONFIG --includedir`
     GD_CFLAGS=`$GDLIB_CONFIG --cflags`