[PATCH] install ext/gd headers

php.internals

Joe Orton

21 years ago
We had a request to install the ext/gd headers, which are needed to compile the pdflib extension. Any objections? I've tested this to at least build the PECL pdflib module. https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=145891 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 9 Feb 2005 10:56:46 -0000 @@ -38,6 +38,8 @@ main/ \ main/streams/ \ regex/ \ + ext/gd/ \ + ext/gd/libgd/ \ ext/iconv/ \ ext/libxml/ \ ext/standard/ \

Jani Taskinen

21 years ago
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.. --Jani On Wed, 9 Feb 2005, Joe Orton wrote:

Joe Orton

21 years ago
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

Jani Taskinen

21 years ago
I added PHP_INSTALL_HEADERS() macro in HEAD. And used it with gd so now those headers are installed. Feel free to backport the patch(es). --Jani On Mon, 14 Feb 2005, Joe Orton wrote:
> 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 > >
-- Donate @ http://pecl.php.net/wishlist.php/sniper