fmk Thu Mar 11 13:48:28 2004 EDT
Modified files:
/php-src/ext/ming config.w32
Log:
Hack to check for ming version 0.2 and 0.3 to inclue the right libs.
http://cvs.php.net/diff.php/php-src/ext/ming/config.w32?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/ming/config.w32
diff -u php-src/ext/ming/config.w32:1.1 php-src/ext/ming/config.w32:1.2
--- php-src/ext/ming/config.w32:1.1 Fri Dec 19 10:04:23 2003
+++ php-src/ext/ming/config.w32 Thu Mar 11 13:48:26 2004
@@ -1,12 +1,40 @@
-// $Id: config.w32,v 1.1 2003/12/19 15:04:23 wez Exp $
+// $Id: config.w32,v 1.2 2004/03/11 18:48:26 fmk Exp $
// vim:ft=javascript
ARG_WITH("ming", "MING support", "no");
-if (PHP_MING != "no") {
+// this is a temporary hack
+function ming_check_version()
+{
+ var c = null;
+ var v;
+ var ming_h = CHECK_HEADER_ADD_INCLUDE("ming.h", "CFLAGS_MING", PHP_MING);
+
+ if (!ming_h) {
+ return false;
+ }
- if (CHECK_HEADER_ADD_INCLUDE("ming.h", "CFLAGS_MING", PHP_MING) &&
- CHECK_LIB("libming.lib", "ming", PHP_MING)) {
+ c = file_get_contents(ming_h + "\\ming.h");
+ if (c.match(/MING_VERSION\s+(0.[a-zA-Z0-9]+)/)) {
+ v = RegExp.$1;
+ if (v > "0.2") {
+ if (CHECK_LIB("libungif.lib", "ming", PHP_MING) &&
+ CHECK_LIB("libpng.lib", "ming", PHP_MING)) {
+ AC_DEFINE('HAVE_NEW_MING', 1);
+ if (PHP_ZLIB != "no") {
+ AC_DEFINE('HAVE_MING_ZLIB', 1);
+ }
+ }
+ }
+ }
+ return true;
+}
+
+if (PHP_MING != "no") {
+ if (ming_check_version() && CHECK_LIB("libming.lib", "ming", PHP_MING)) {
+ if (PHP_ZLIB_SHARED) {
+ CHECK_LIB("zlib.lib", "ming", PHP_MING);
+ }
EXTENSION('ming', 'ming.c');
AC_DEFINE('HAVE_MING', 1);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
