Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:14921 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 3269 invoked by uid 1010); 14 Feb 2005 16:39:04 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 3251 invoked from network); 14 Feb 2005 16:39:03 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 14 Feb 2005 16:39:03 -0000 X-Host-Fingerprint: 66.187.233.31 mx1.redhat.com Linux 2.4/2.6 Received: from ([66.187.233.31:41948] helo=mx1.redhat.com) by pb1.pair.com (ecelerity 1.2.11 (r4403)) with SMTP id 76/E4-18098-524D0124 for ; Mon, 14 Feb 2005 11:39:01 -0500 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id j1EAG9hw014849 for ; Mon, 14 Feb 2005 05:16:09 -0500 Received: from radish.cambridge.redhat.com (radish.cambridge.redhat.com [172.16.18.90]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id j1EAG8O26544 for ; Mon, 14 Feb 2005 05:16:08 -0500 Received: from radish.cambridge.redhat.com (localhost.localdomain [127.0.0.1]) by radish.cambridge.redhat.com (8.13.1/8.12.7) with ESMTP id j1EAG7Dc023956 for ; Mon, 14 Feb 2005 10:16:07 GMT Received: (from jorton@localhost) by radish.cambridge.redhat.com (8.13.1/8.12.10/Submit) id j1EAG72N023955 for internals@lists.php.net; Mon, 14 Feb 2005 10:16:07 GMT Date: Mon, 14 Feb 2005 10:16:07 +0000 To: internals@lists.php.net Message-ID: <20050214101606.GA23418@redhat.com> Mail-Followup-To: internals@lists.php.net References: <20050209105920.GA3959@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.1i Subject: Re: [PHP-DEV] [PATCH] install ext/gd headers From: jorton@redhat.com (Joe Orton) 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