cvs: php4 /ext/gd config.m4

sniper Tue Jun 4 14:44:54 2002 EDT Modified files: /php4/ext/gd config.m4 Log: - Fixed the include paths for the needed libraries for bundled libgd. - Removed files which are not needed with libgd2 from the PHP_NEW_EXTENSION. Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.93 php4/ext/gd/config.m4:1.94 --- php4/ext/gd/config.m4:1.93 Mon Jun 3 21:13:01 2002 +++ php4/ext/gd/config.m4 Tue Jun 4 14:44:54 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.93 2002/06/04 01:13:01 sniper Exp $ +dnl $Id: config.m4,v 1.94 2002/06/04 18:44:54 sniper Exp $ dnl dnl @@ -47,6 +47,7 @@ PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, [ + PHP_ADD_INCLUDE($GD_JPEG_DIR/include) PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD) ],[ AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.]) @@ -75,6 +76,7 @@ PHP_CHECK_LIBRARY(png,png_write_image, [ + PHP_ADD_INCLUDE($GD_PNG_DIR/include) PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD) ],[ @@ -101,6 +103,7 @@ PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage, [ + PHP_ADD_INCLUDE($GD_XPM_DIR/include) PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) ],[ @@ -144,10 +147,11 @@ AC_DEFUN(PHP_GD_FREETYPE2,[ 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 FREETYPE2_DIR=$i - FREETYPE2_INC_DIR=$i/include/freetype2/freetype + FREETYPE2_INC_DIR=$i/include/freetype2 fi done @@ -178,7 +182,7 @@ PHP_CHECK_LIBRARY(t1, T1_LoadFont, [ AC_DEFINE(HAVE_LIBT1,1,[ ]) - PHP_ADD_INCLUDE("$GD_T1_DIR/include") + PHP_ADD_INCLUDE($GD_T1_DIR/include) PHP_ADD_LIBRARY_WITH_PATH(t1, "$GD_T1_DIR/lib", GD_SHARED_LIBADD) ],[ AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) @@ -228,7 +232,7 @@ libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c libgd/gdkanji.c \ libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c libgd/gd_topal.c" - PHP_NEW_EXTENSION(gd, gd.c gdcache.c gdttf.c gdt1.c $sources, $ext_shared,, \\$(GDLIB_CFLAGS)) + PHP_NEW_EXTENSION(gd, gd.c gdt1.c $sources, $ext_shared,, \\$(GDLIB_CFLAGS)) PHP_ADD_INCLUDE($ext_srcdir/libgd) PHP_ADD_BUILD_DIR($ext_builddir/libgd)