cvs: php4 /ext/gd config.m4
| From: | Sander Roobol | Date: | Sat, 07 Sep 2002 12:53:05 +0000 |
| Subject: | cvs: php4 /ext/gd config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13890@lists.php.net to get a copy of this message | ||
sander Sat Sep 7 08:53:05 2002 EDT
Modified files:
/php4/ext/gd config.m4
Log:
Fix build with bundled gd when builddir!=srcdir
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.110 php4/ext/gd/config.m4:1.111
--- php4/ext/gd/config.m4:1.110 Thu Sep 5 16:13:20 2002
+++ php4/ext/gd/config.m4 Sat Sep 7 08:53:05 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.110 2002/09/05 20:13:20 sniper Exp $
+dnl $Id: config.m4,v 1.111 2002/09/07 12:53:05 sander Exp $
dnl
dnl
@@ -248,8 +248,6 @@
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_ADD_BUILD_DIR($ext_builddir/libgd)
-
dnl check for fabsf and floorf which are available since C99
AC_CHECK_FUNCS(fabsf floorf)
@@ -365,6 +363,7 @@
if test "$GD_MODULE_TYPE" = "builtin"; then
GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS"
+ PHP_ADD_BUILD_DIR($ext_builddir/libgd)
else
GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_FCLAGS"
PHP_ADD_INCLUDE($GD_INCLUDE)