cvs: php-src /ext/gd config.m4

sniper Fri May 4 21:57:22 2007 UTC Modified files: /php-src/ext/gd config.m4 Log: - Prevent bugs like #41265 being submitted from now on. http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.171&r2=1.172&diff_format=u Index: php-src/ext/gd/config.m4 diff -u php-src/ext/gd/config.m4:1.171 php-src/ext/gd/config.m4:1.172 --- php-src/ext/gd/config.m4:1.171 Wed Apr 11 10:43:28 2007 +++ php-src/ext/gd/config.m4 Fri May 4 21:57:22 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.171 2007/04/11 10:43:28 scottmac Exp $ +dnl $Id: config.m4,v 1.172 2007/05/04 21:57:22 sniper Exp $ dnl dnl @@ -175,7 +175,12 @@ 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_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 @@ 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