#33620 [Opn->Csd]: [PATCH] adding "--without-t1lib" for win32 GD configure
| From: | edink@php.net | Date: | Mon, 01 Aug 2005 22:22:09 +0000 |
| Subject: | #33620 [Opn->Csd]: [PATCH] adding "--without-t1lib" for win32 GD configure | ||
| References: | 1 | Groups: | php.bugs |
| Request: | Send a blank email to php-bugs+get-82781@lists.php.net to get a copy of this message | ||
ID: 33620
Updated by: edink@php.net
Reported By: msisolak at yahoo dot com
-Status: Open
+Status: Closed
Bug Type: Feature/Change Request
Operating System: Windows 2000
PHP Version: 5.1.0b2
New Comment:
This bug has been fixed in CVS.
Snapshots of the sources are packaged every three hours; this change
will be in the next snapshot. You can grab the snapshot at
http://snaps.php.net/.
Thank you for the report, and for helping us make PHP better.
Previous Comments:
------------------------------------------------------------------------
[2005-07-09 03:43:52] msisolak at yahoo dot com
Description:
------------
Please consider the following patch which adds a "--without-t1lib"
option for the win32 configure/make process (to ext/gd/config.w32). For
those of us who want GD, but won't ever need the Type 1 font support
recently added, it would be useful to be able to not include the bulk
of t1lib. Thanks.
--- config.w32.orig Thu Jun 30 10:15:57 2005
+++ config.w32 Thu Jun 30 10:13:40 2005
@@ -2,16 +2,24 @@
// vim:ft=javascript
ARG_WITH("gd", "Bundled GD support", "yes,shared");
+ARG_WITH("t1lib", "t1lib support", "yes");
if (PHP_GD != "no") {
if (CHECK_LIB("libjpeg.lib", "gd", PHP_GD) &&
CHECK_LIB("freetype2.lib", "gd", PHP_GD) &&
CHECK_LIB("libpng.lib", "gd", PHP_GD) &&
- CHECK_LIB("T1_StaticMD.lib", "gd", PHP_GD) &&
CHECK_LIB("zlib.lib", "gd", PHP_GD + ";..\\zlib;" +
php_usual_lib_suspects) &&
- CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD +
";ext\\gd\\libgd") &&
- CHECK_HEADER_ADD_INCLUDE("t1lib.h", "CFLAGS_GD", PHP_GD + ";" +
PHP_PHP_BUILD + "\\include\\t1lib")
+ CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD +
";ext\\gd\\libgd")
) {
+ if (PHP_T1LIB != "no") {
+ if (CHECK_LIB("T1_StaticMD.lib", "gd", PHP_GD) &&
+ CHECK_HEADER_ADD_INCLUDE("t1lib.h", "CFLAGS_GD", PHP_GD + ";" +
PHP_PHP_BUILD + "\\include\\t1lib")
+ ) {
+ ADD_FLAG("CFLAGS_GD", "/D HAVE_LIBT1");
+ } else {
+ WARNING("t1lib not enabled; libraries and headers not found");
+ }
+ }
EXTENSION("gd", "gd.c gdttf.c", null, "-Iext/gd/libgd",
"php_gd2.dll");
ADD_SOURCES("ext/gd/libgd", "gd2copypal.c gd_arc_f_buggy.c gd.c \
@@ -43,7 +51,6 @@
/D HAVE_LIBPNG \
/D USE_GD_IMGSTRTTF \
/D USE_GD_IOCTX \
-/D HAVE_LIBT1 \
/D MSWIN32 \
");
} else {
------------------------------------------------------------------------
--
Edit this bug report at http://bugs.php.net/?id=33620&edit=1