On Thu, Feb 10, 2005 at 03:21:45PM +0200, Jani Taskinen wrote:
>
> While this patch works fine, what if you don't actually have
> GD installed in your PHP? There should be a configure macro
> that adds the headers when really needed..
Good point. OK, how about this instead:
Index: scripts/Makefile.frag
===================================================================
RCS file: /repository/php-src/scripts/Makefile.frag,v
retrieving revision 1.14
diff -u -r1.14 Makefile.frag
--- scripts/Makefile.frag 20 Jan 2005 01:41:20 -0000 1.14
+++ scripts/Makefile.frag 14 Feb 2005 10:15:31 -0000
@@ -38,6 +38,7 @@
main/ \
main/streams/ \
regex/ \
+ $(GD_HEADER_DIRS) \
ext/iconv/ \
ext/libxml/ \
ext/standard/ \
Index: ext/gd/config.m4
===================================================================
RCS file: /repository/php-src/ext/gd/config.m4,v
retrieving revision 1.151
diff -u -r1.151 config.m4
--- ext/gd/config.m4 4 Jan 2005 06:51:44 -0000 1.151
+++ ext/gd/config.m4 14 Feb 2005 10:15:31 -0000
@@ -410,7 +410,9 @@
if test "$GD_MODULE_TYPE" = "builtin"; then
GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS"
PHP_ADD_BUILD_DIR($ext_builddir/libgd)
+ GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/"
else
+ GD_HEADER_DIRS="ext/gd/"
GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS"
PHP_ADD_INCLUDE($GD_INCLUDE)
@@ -421,4 +423,5 @@
PHP_SUBST(GDLIB_CFLAGS)
PHP_SUBST(GD_SHARED_LIBADD)
+ PHP_SUBST(GD_HEADER_DIRS)
fi
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
