edink Mon Aug 1 17:57:10 2005 EDT
Modified files:
/php-src/ext/gd config.w32
/php-src/win32/build confutils.js
Log:
Allow building gd on windows systems without t1lib (M. Sisolak) #33620
http://cvs.php.net/diff.php/php-src/ext/gd/config.w32?r1=1.7&r2=1.8&ty=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.7 php-src/ext/gd/config.w32:1.8
--- php-src/ext/gd/config.w32:1.7 Mon Apr 25 05:08:48 2005
+++ php-src/ext/gd/config.w32 Mon Aug 1 17:57:08 2005
@@ -1,17 +1,25 @@
-// $Id: config.w32,v 1.7 2005/04/25 09:08:48 edink Exp $
+// $Id: config.w32,v 1.8 2005/08/01 21:57:08 edink Exp $
// 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 {
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.58&r2=1.59&ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.58
php-src/win32/build/confutils.js:1.59
--- php-src/win32/build/confutils.js:1.58 Thu Jul 7 09:22:38 2005
+++ php-src/win32/build/confutils.js Mon Aug 1 17:57:09 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.58 2005/07/07 13:22:38 wez Exp $
+// $Id: confutils.js,v 1.59 2005/08/01 21:57:09 edink Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -350,7 +350,7 @@
'php-build', 'snapshot-template',
'pcre-regex', 'fastcgi', 'force-cgi-redirect',
'path-info-check', 'zts', 'ipv6', 'memory-limit',
- 'zend-multibyte', 'fd-setsize', 'memory-manager'
+ 'zend-multibyte', 'fd-setsize', 'memory-manager', 't1lib'
);
var force;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
