cvs: php4 /ext/gd config.m4
| From: | Jani Taskinen | Date: | Fri, 28 Jun 2002 07:47:22 +0000 |
| Subject: | cvs: php4 /ext/gd config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12591@lists.php.net to get a copy of this message | ||
sniper Fri Jun 28 03:47:22 2002 EDT
Modified files:
/php4/ext/gd config.m4
Log:
- Fix bug: #17671
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.99 php4/ext/gd/config.m4:1.100
--- php4/ext/gd/config.m4:1.99 Tue Jun 25 05:00:08 2002
+++ php4/ext/gd/config.m4 Fri Jun 28 03:47:19 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.99 2002/06/25 09:00:08 helly Exp $
+dnl $Id: config.m4,v 1.100 2002/06/28 07:47:19 sniper Exp $
dnl
dnl
@@ -238,7 +238,6 @@
libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c libgd/gd_topal.c"
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)
dnl PNG is required by GD library
@@ -268,7 +267,8 @@
AC_DEFINE(HAVE_GD_BUNDLED, 1, [ ])
- GDLIB_CFLAGS="-DHAVE_LIBPNG"
+dnl Make sure the libgd/ is first in the include path
+ GDLIB_CFLAGS="-I$ext_srcdir/libgd -DHAVE_LIBPNG"
dnl Depending which libraries were included to PHP configure,
dnl enable the support in bundled GD library