cvs: php-src(PHP_5_3) /ext/ereg config.w32 /ext/libxml config.w32 /ext/mysqlnd config.w32 /ext/zlib config.w32 /sapi/apache2filter config.w32
/sapi/apache2handler config.w32 /sapi/isapi config.w32 /win32/build confutils.js
| From: | Elizabeth Marie Smith | Date: | Wed, 14 May 2008 03:13:17 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/ereg config.w32 /ext/libxml config.w32 /ext/mysqlnd config.w32 /ext/zlib config.w32 /sapi/apache2filter config.w32 /sapi/apache2handler config.w32 /sapi/isapi config.w32 /win32/build confutils.js |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-49956@lists.php.net to get a copy of this message | ||
auroraeosrose Wed May 14 03:13:17 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/ereg config.w32
/php-src/ext/libxml config.w32
/php-src/ext/mysqlnd config.w32
/php-src/ext/zlib config.w32
/php-src/sapi/apache2filter config.w32
/php-src/sapi/apache2handler config.w32
/php-src/sapi/isapi config.w32
/php-src/win32/build confutils.js
Log:
Windows configure fixes, a few additional lib names allowed, apache2 only on for zts builds since
apache on win is always threaded, isapi no longer stops configure in non-zts mode, look for _debug
for debug libraries when debug is enabled
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/config.w32?r1=1.2.2.2&r2=1.2.2.3&diff_format=u Index: php-src/ext/ereg/config.w32 diff -u php-src/ext/ereg/config.w32:1.2.2.2 php-src/ext/ereg/config.w32:1.2.2.3 --- php-src/ext/ereg/config.w32:1.2.2.2 Fri Oct 5 15:00:05 2007 +++ php-src/ext/ereg/config.w32 Wed May 14 03:13:16 2008 @@ -1,7 +1,11 @@ -// $Id: config.w32,v 1.2.2.2 2007/10/05 15:00:05 jani Exp $ +// $Id: config.w32,v 1.2.2.3 2008/05/14 03:13:16 auroraeosrose Exp $ // vim:ft=javascript -EXTENSION("ereg", "ereg.c", false /* never shared */, "-Dregexec=php_regexec -Dregerror=php_regerror -Dregfree=php_regfree -Dregcomp=php_regcomp -Iext/ereg/regex"); -ADD_SOURCES("ext/ereg/regex", "regcomp.c regexec.c regerror.c regfree.c", "ereg"); -AC_DEFINE('REGEX', 1, 'Bundled regex'); -AC_DEFINE('HSREGEX', 1, 'Bundled regex'); +ARG_WITH("ereg", "POSIX extended regular expressions", "yes"); +if (PHP_EREG != "no") { + + EXTENSION("ereg", "ereg.c", false /* never shared */, "-Dregexec=php_regexec -Dregerror=php_regerror -Dregfree=php_regfree -Dregcomp=php_regcomp -Iext/ereg/regex"); + ADD_SOURCES("ext/ereg/regex", "regcomp.c regexec.c regerror.c regfree.c", "ereg"); + AC_DEFINE('REGEX', 1, 'Bundled regex'); + AC_DEFINE('HSREGEX', 1, 'Bundled regex'); +} \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/config.w32?r1=1.8.6.1&r2=1.8.6.2&diff_format=u Index: php-src/ext/libxml/config.w32 diff -u php-src/ext/libxml/config.w32:1.8.6.1 php-src/ext/libxml/config.w32:1.8.6.2 --- php-src/ext/libxml/config.w32:1.8.6.1 Tue Dec 4 17:14:34 2007 +++ php-src/ext/libxml/config.w32 Wed May 14 03:13:17 2008 @@ -1,11 +1,11 @@ -// $Id: config.w32,v 1.8.6.1 2007/12/04 17:14:34 rrichards Exp $ +// $Id: config.w32,v 1.8.6.2 2008/05/14 03:13:17 auroraeosrose Exp $ // vim:ft=javascript ARG_WITH("libxml", "LibXML support", "yes"); if (PHP_LIBXML == "yes") { if (CHECK_LIB("libxml2_a_dll.lib;libxml2_a.lib", "libxml") && - CHECK_LIB("iconv_a.lib;iconv.lib", "libxml") && + CHECK_LIB("libiconv_a.lib;iconv_a.lib;libiconv.lib;iconv.lib", "libxml") && CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS")) { EXTENSION("libxml", "libxml.c", false /* never shared */); http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config.w32?r1=1.4.2.6&r2=1.4.2.7&diff_format=u Index: php-src/ext/mysqlnd/config.w32 diff -u php-src/ext/mysqlnd/config.w32:1.4.2.6 php-src/ext/mysqlnd/config.w32:1.4.2.7 --- php-src/ext/mysqlnd/config.w32:1.4.2.6 Tue Jan 29 12:25:25 2008 +++ php-src/ext/mysqlnd/config.w32 Wed May 14 03:13:17 2008 @@ -1,21 +1,25 @@ -// $Id: config.w32,v 1.4.2.6 2008/01/29 12:25:25 dmitry Exp $ +// $Id: config.w32,v 1.4.2.7 2008/05/14 03:13:17 auroraeosrose Exp $ // vim:ft=javascript -if (CHECK_LIB("ws2_32.lib", "mysqlnd")) { - mysqlnd_source = - "mysqlnd.c " + - "mysqlnd_block_alloc.c " + - "mysqlnd_charset.c " + - "mysqlnd_debug.c " + - "mysqlnd_loaddata.c " + - "mysqlnd_palloc.c " + - "mysqlnd_ps.c " + - "mysqlnd_ps_codec.c " + - "mysqlnd_qcache.c " + - "mysqlnd_result.c " + - "mysqlnd_result_meta.c " + - "mysqlnd_statistics.c " + - "mysqlnd_wireprotocol.c " + - "php_mysqlnd.c"; - EXTENSION("mysqlnd", mysqlnd_source, false); -} +ARG_WITH("mysqlnd", "Mysql Native Client Driver", "yes"); +if (PHP_MYSQLND != "no") { + + if (CHECK_LIB("ws2_32.lib", "mysqlnd")) { + mysqlnd_source = + "mysqlnd.c " + + "mysqlnd_block_alloc.c " + + "mysqlnd_charset.c " + + "mysqlnd_debug.c " + + "mysqlnd_loaddata.c " + + "mysqlnd_palloc.c " + + "mysqlnd_ps.c " + + "mysqlnd_ps_codec.c " + + "mysqlnd_qcache.c " + + "mysqlnd_result.c " + + "mysqlnd_result_meta.c " + + "mysqlnd_statistics.c " + + "mysqlnd_wireprotocol.c " + + "php_mysqlnd.c"; + EXTENSION("mysqlnd", mysqlnd_source, false); + } +} \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/config.w32?r1=1.8&r2=1.8.6.1&diff_format=u Index: php-src/ext/zlib/config.w32 diff -u php-src/ext/zlib/config.w32:1.8 php-src/ext/zlib/config.w32:1.8.6.1 --- php-src/ext/zlib/config.w32:1.8 Sat Jul 17 00:21:04 2004 +++ php-src/ext/zlib/config.w32 Wed May 14 03:13:17 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.8 2004/07/17 00:21:04 pollita Exp $ +// $Id: config.w32,v 1.8.6.1 2008/05/14 03:13:17 auroraeosrose Exp $ // vim:ft=javascript ARG_ENABLE("zlib", "ZLIB support", "yes"); @@ -6,7 +6,7 @@ if (PHP_ZLIB == "yes") { EXTENSION("zlib", "zlib.c zlib_fopen_wrapper.c zlib_filter.c", null, "/D ZLIB_EXPORTS"); AC_DEFINE("HAVE_ZLIB", 1, "ZLIB support"); - CHECK_LIB("zlib.lib", "zlib", PHP_ZLIB); + CHECK_LIB("zlib_a.lib;zlib.lib", "zlib", PHP_ZLIB); CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" + php_usual_include_suspects); if (!PHP_ZLIB_SHARED) { ADD_DEF_FILE("ext\\zlib\\php_zlib.def"); http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.w32?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/sapi/apache2filter/config.w32 diff -u php-src/sapi/apache2filter/config.w32:1.1.2.1 php-src/sapi/apache2filter/config.w32:1.1.2.1.2.1 --- php-src/sapi/apache2filter/config.w32:1.1.2.1 Fri May 4 18:17:55 2007 +++ php-src/sapi/apache2filter/config.w32 Wed May 14 03:13:17 2008 @@ -1,10 +1,12 @@ // vim:ft=javascript -// $Id: config.w32,v 1.1.2.1 2007/05/04 18:17:55 edink Exp $ +// $Id: config.w32,v 1.1.2.1.2.1 2008/05/14 03:13:17 auroraeosrose Exp $ ARG_ENABLE('apache2filter', 'Build Apache 2.x filter', 'no'); if (PHP_APACHE2FILTER != "no") { - if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2FILTER", PHP_PHP_BUILD + "\\include\\apache2") && + if (PHP_ZTS == "no") { + WARNING("Apache2 module requires an --enable-zts build of PHP on windows"); + } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2FILTER", PHP_PHP_BUILD + "\\include\\apache2") && CHECK_LIB("libhttpd.lib", "apache2filter", PHP_PHP_BUILD + "\\lib\\apache2") && CHECK_LIB("libapr.lib", "apache2filter", PHP_PHP_BUILD + "\\lib\\apache2") && CHECK_LIB("libaprutil.lib", "apache2filter", PHP_PHP_BUILD + "\\lib\\apache2") @@ -20,7 +22,9 @@ ARG_ENABLE('apache2-2filter', 'Build Apache 2.2.x filter', 'no'); if (PHP_APACHE2_2FILTER != "no") { - if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_2FILTER", PHP_PHP_BUILD + "\\include\\apache2_2") && + if (PHP_ZTS == "no") { + WARNING("Apache2 module requires an --enable-zts build of PHP on windows"); + } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_2FILTER", PHP_PHP_BUILD + "\\include\\apache2_2") && CHECK_LIB("libhttpd.lib", "apache2_2filter", PHP_PHP_BUILD + "\\lib\\apache2_2") && CHECK_LIB("libapr-1.lib", "apache2_2filter", PHP_PHP_BUILD + "\\lib\\apache2_2") && CHECK_LIB("libaprutil-1.lib", "apache2_2filter", PHP_PHP_BUILD + "\\lib\\apache2_2") http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/config.w32?r1=1.1.6.2&r2=1.1.6.2.2.1&diff_format=u Index: php-src/sapi/apache2handler/config.w32 diff -u php-src/sapi/apache2handler/config.w32:1.1.6.2 php-src/sapi/apache2handler/config.w32:1.1.6.2.2.1 --- php-src/sapi/apache2handler/config.w32:1.1.6.2 Fri May 4 18:17:55 2007 +++ php-src/sapi/apache2handler/config.w32 Wed May 14 03:13:17 2008 @@ -1,10 +1,12 @@ // vim:ft=javascript -// $Id: config.w32,v 1.1.6.2 2007/05/04 18:17:55 edink Exp $ +// $Id: config.w32,v 1.1.6.2.2.1 2008/05/14 03:13:17 auroraeosrose Exp $ ARG_ENABLE('apache2handler', 'Build Apache 2.x handler', 'no'); if (PHP_APACHE2HANDLER != "no") { - if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2HANDLER", PHP_PHP_BUILD + "\\include\\apache2") && + if (PHP_ZTS == "no") { + WARNING("Apache2 module requires an --enable-zts build of PHP on windows"); + } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2HANDLER", PHP_PHP_BUILD + "\\include\\apache2") && CHECK_LIB("libhttpd.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") && CHECK_LIB("libapr.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") && CHECK_LIB("libaprutil.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") @@ -20,7 +22,9 @@ ARG_ENABLE('apache2-2handler', 'Build Apache 2.2.x handler', 'no'); if (PHP_APACHE2_2HANDLER != "no") { - if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_2HANDLER", PHP_PHP_BUILD + "\\include\\apache2_2") && + if (PHP_ZTS == "no") { + WARNING("Apache2 module requires an --enable-zts build of PHP on windows"); + } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_2HANDLER", PHP_PHP_BUILD + "\\include\\apache2_2") && CHECK_LIB("libhttpd.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") && CHECK_LIB("libapr-1.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") && CHECK_LIB("libaprutil-1.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") http://cvs.php.net/viewvc.cgi/php-src/sapi/isapi/config.w32?r1=1.4&r2=1.4.8.1&diff_format=u Index: php-src/sapi/isapi/config.w32 diff -u php-src/sapi/isapi/config.w32:1.4 php-src/sapi/isapi/config.w32:1.4.8.1 --- php-src/sapi/isapi/config.w32:1.4 Sat Jan 17 13:00:13 2004 +++ php-src/sapi/isapi/config.w32 Wed May 14 03:13:17 2008 @@ -1,13 +1,13 @@ // vim:ft=javascript -// $Id: config.w32,v 1.4 2004/01/17 13:00:13 sniper Exp $ +// $Id: config.w32,v 1.4.8.1 2008/05/14 03:13:17 auroraeosrose Exp $ ARG_ENABLE('isapi', 'Build ISAPI version of PHP', 'no'); if (PHP_ISAPI == "yes") { if (PHP_ZTS == "no") { - ERROR("ISAPI module requires an --enable-zts build of PHP"); + WARNING("ISAPI module requires an --enable-zts build of PHP"); + } else { + SAPI('isapi', 'php5isapi.c', 'php' + PHP_VERSION + 'isapi.dll', '/D PHP5ISAPI_EXPORTS'); + ADD_FLAG('LDFLAGS_ISAPI', '/DEF:sapi\\isapi\\php5isapi.def'); } - - SAPI('isapi', 'php5isapi.c', 'php' + PHP_VERSION + 'isapi.dll', '/D PHP5ISAPI_EXPORTS'); - ADD_FLAG('LDFLAGS_ISAPI', '/DEF:sapi\\isapi\\php5isapi.def'); } http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.10&r2=1.60.2.1.2.8.2.11&diff_format=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.10 php-src/win32/build/confutils.js:1.60.2.1.2.8.2.11 --- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.10 Mon Apr 14 17:55:02 2008 +++ php-src/win32/build/confutils.js Wed May 14 03:13:17 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.60.2.1.2.8.2.10 2008/04/14 17:55:02 sfox Exp $ +// $Id: confutils.js,v 1.60.2.1.2.8.2.11 2008/05/14 03:13:17 auroraeosrose Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -586,6 +586,17 @@ // libnames can be ; separated list of accepted library names libnames = libnames.split(';'); + // for debug builds, lib may have _debug appended, we want that first + if (PHP_DEBUG == "yes") { + var length = libnames.length; + for (var i = 0; i < length; i++) { + var name = new String(libnames[i]); + rExp = /.lib$/i; + name = name.replace(rExp,"_debug.lib"); + libnames.unshift(name); + } + } + var i, j, k, libname; var location = false; var path = path_to_check.split(';');
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/config.w32?r1=1.2.2.2&r2=1.2.2.3&diff_format=u Index: php-src/ext/ereg/config.w32 diff -u php-src/ext/ereg/config.w32:1.2.2.2 php-src/ext/ereg/config.w32:1.2.2.3 --- php-src/ext/ereg/config.w32:1.2.2.2 Fri Oct 5 15:00:05 2007 +++ php-src/ext/ereg/config.w32 Wed May 14 03:13:16 2008 @@ -1,7 +1,11 @@ -// $Id: config.w32,v 1.2.2.2 2007/10/05 15:00:05 jani Exp $ +// $Id: config.w32,v 1.2.2.3 2008/05/14 03:13:16 auroraeosrose Exp $ // vim:ft=javascript -EXTENSION("ereg", "ereg.c", false /* never shared */, "-Dregexec=php_regexec -Dregerror=php_regerror -Dregfree=php_regfree -Dregcomp=php_regcomp -Iext/ereg/regex"); -ADD_SOURCES("ext/ereg/regex", "regcomp.c regexec.c regerror.c regfree.c", "ereg"); -AC_DEFINE('REGEX', 1, 'Bundled regex'); -AC_DEFINE('HSREGEX', 1, 'Bundled regex'); +ARG_WITH("ereg", "POSIX extended regular expressions", "yes"); +if (PHP_EREG != "no") { + + EXTENSION("ereg", "ereg.c", false /* never shared */, "-Dregexec=php_regexec -Dregerror=php_regerror -Dregfree=php_regfree -Dregcomp=php_regcomp -Iext/ereg/regex"); + ADD_SOURCES("ext/ereg/regex", "regcomp.c regexec.c regerror.c regfree.c", "ereg"); + AC_DEFINE('REGEX', 1, 'Bundled regex'); + AC_DEFINE('HSREGEX', 1, 'Bundled regex'); +} \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/config.w32?r1=1.8.6.1&r2=1.8.6.2&diff_format=u Index: php-src/ext/libxml/config.w32 diff -u php-src/ext/libxml/config.w32:1.8.6.1 php-src/ext/libxml/config.w32:1.8.6.2 --- php-src/ext/libxml/config.w32:1.8.6.1 Tue Dec 4 17:14:34 2007 +++ php-src/ext/libxml/config.w32 Wed May 14 03:13:17 2008 @@ -1,11 +1,11 @@ -// $Id: config.w32,v 1.8.6.1 2007/12/04 17:14:34 rrichards Exp $ +// $Id: config.w32,v 1.8.6.2 2008/05/14 03:13:17 auroraeosrose Exp $ // vim:ft=javascript ARG_WITH("libxml", "LibXML support", "yes"); if (PHP_LIBXML == "yes") { if (CHECK_LIB("libxml2_a_dll.lib;libxml2_a.lib", "libxml") && - CHECK_LIB("iconv_a.lib;iconv.lib", "libxml") && + CHECK_LIB("libiconv_a.lib;iconv_a.lib;libiconv.lib;iconv.lib", "libxml") && CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS")) { EXTENSION("libxml", "libxml.c", false /* never shared */); http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config.w32?r1=1.4.2.6&r2=1.4.2.7&diff_format=u Index: php-src/ext/mysqlnd/config.w32 diff -u php-src/ext/mysqlnd/config.w32:1.4.2.6 php-src/ext/mysqlnd/config.w32:1.4.2.7 --- php-src/ext/mysqlnd/config.w32:1.4.2.6 Tue Jan 29 12:25:25 2008 +++ php-src/ext/mysqlnd/config.w32 Wed May 14 03:13:17 2008 @@ -1,21 +1,25 @@ -// $Id: config.w32,v 1.4.2.6 2008/01/29 12:25:25 dmitry Exp $ +// $Id: config.w32,v 1.4.2.7 2008/05/14 03:13:17 auroraeosrose Exp $ // vim:ft=javascript -if (CHECK_LIB("ws2_32.lib", "mysqlnd")) { - mysqlnd_source = - "mysqlnd.c " + - "mysqlnd_block_alloc.c " + - "mysqlnd_charset.c " + - "mysqlnd_debug.c " + - "mysqlnd_loaddata.c " + - "mysqlnd_palloc.c " + - "mysqlnd_ps.c " + - "mysqlnd_ps_codec.c " + - "mysqlnd_qcache.c " + - "mysqlnd_result.c " + - "mysqlnd_result_meta.c " + - "mysqlnd_statistics.c " + - "mysqlnd_wireprotocol.c " + - "php_mysqlnd.c"; - EXTENSION("mysqlnd", mysqlnd_source, false); -} +ARG_WITH("mysqlnd", "Mysql Native Client Driver", "yes"); +if (PHP_MYSQLND != "no") { + + if (CHECK_LIB("ws2_32.lib", "mysqlnd")) { + mysqlnd_source = + "mysqlnd.c " + + "mysqlnd_block_alloc.c " + + "mysqlnd_charset.c " + + "mysqlnd_debug.c " + + "mysqlnd_loaddata.c " + + "mysqlnd_palloc.c " + + "mysqlnd_ps.c " + + "mysqlnd_ps_codec.c " + + "mysqlnd_qcache.c " + + "mysqlnd_result.c " + + "mysqlnd_result_meta.c " + + "mysqlnd_statistics.c " + + "mysqlnd_wireprotocol.c " + + "php_mysqlnd.c"; + EXTENSION("mysqlnd", mysqlnd_source, false); + } +} \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/config.w32?r1=1.8&r2=1.8.6.1&diff_format=u Index: php-src/ext/zlib/config.w32 diff -u php-src/ext/zlib/config.w32:1.8 php-src/ext/zlib/config.w32:1.8.6.1 --- php-src/ext/zlib/config.w32:1.8 Sat Jul 17 00:21:04 2004 +++ php-src/ext/zlib/config.w32 Wed May 14 03:13:17 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.8 2004/07/17 00:21:04 pollita Exp $ +// $Id: config.w32,v 1.8.6.1 2008/05/14 03:13:17 auroraeosrose Exp $ // vim:ft=javascript ARG_ENABLE("zlib", "ZLIB support", "yes"); @@ -6,7 +6,7 @@ if (PHP_ZLIB == "yes") { EXTENSION("zlib", "zlib.c zlib_fopen_wrapper.c zlib_filter.c", null, "/D ZLIB_EXPORTS"); AC_DEFINE("HAVE_ZLIB", 1, "ZLIB support"); - CHECK_LIB("zlib.lib", "zlib", PHP_ZLIB); + CHECK_LIB("zlib_a.lib;zlib.lib", "zlib", PHP_ZLIB); CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" + php_usual_include_suspects); if (!PHP_ZLIB_SHARED) { ADD_DEF_FILE("ext\\zlib\\php_zlib.def"); http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.w32?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/sapi/apache2filter/config.w32 diff -u php-src/sapi/apache2filter/config.w32:1.1.2.1 php-src/sapi/apache2filter/config.w32:1.1.2.1.2.1 --- php-src/sapi/apache2filter/config.w32:1.1.2.1 Fri May 4 18:17:55 2007 +++ php-src/sapi/apache2filter/config.w32 Wed May 14 03:13:17 2008 @@ -1,10 +1,12 @@ // vim:ft=javascript -// $Id: config.w32,v 1.1.2.1 2007/05/04 18:17:55 edink Exp $ +// $Id: config.w32,v 1.1.2.1.2.1 2008/05/14 03:13:17 auroraeosrose Exp $ ARG_ENABLE('apache2filter', 'Build Apache 2.x filter', 'no'); if (PHP_APACHE2FILTER != "no") { - if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2FILTER", PHP_PHP_BUILD + "\\include\\apache2") && + if (PHP_ZTS == "no") { + WARNING("Apache2 module requires an --enable-zts build of PHP on windows"); + } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2FILTER", PHP_PHP_BUILD + "\\include\\apache2") && CHECK_LIB("libhttpd.lib", "apache2filter", PHP_PHP_BUILD + "\\lib\\apache2") && CHECK_LIB("libapr.lib", "apache2filter", PHP_PHP_BUILD + "\\lib\\apache2") && CHECK_LIB("libaprutil.lib", "apache2filter", PHP_PHP_BUILD + "\\lib\\apache2") @@ -20,7 +22,9 @@ ARG_ENABLE('apache2-2filter', 'Build Apache 2.2.x filter', 'no'); if (PHP_APACHE2_2FILTER != "no") { - if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_2FILTER", PHP_PHP_BUILD + "\\include\\apache2_2") && + if (PHP_ZTS == "no") { + WARNING("Apache2 module requires an --enable-zts build of PHP on windows"); + } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_2FILTER", PHP_PHP_BUILD + "\\include\\apache2_2") && CHECK_LIB("libhttpd.lib", "apache2_2filter", PHP_PHP_BUILD + "\\lib\\apache2_2") && CHECK_LIB("libapr-1.lib", "apache2_2filter", PHP_PHP_BUILD + "\\lib\\apache2_2") && CHECK_LIB("libaprutil-1.lib", "apache2_2filter", PHP_PHP_BUILD + "\\lib\\apache2_2") http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/config.w32?r1=1.1.6.2&r2=1.1.6.2.2.1&diff_format=u Index: php-src/sapi/apache2handler/config.w32 diff -u php-src/sapi/apache2handler/config.w32:1.1.6.2 php-src/sapi/apache2handler/config.w32:1.1.6.2.2.1 --- php-src/sapi/apache2handler/config.w32:1.1.6.2 Fri May 4 18:17:55 2007 +++ php-src/sapi/apache2handler/config.w32 Wed May 14 03:13:17 2008 @@ -1,10 +1,12 @@ // vim:ft=javascript -// $Id: config.w32,v 1.1.6.2 2007/05/04 18:17:55 edink Exp $ +// $Id: config.w32,v 1.1.6.2.2.1 2008/05/14 03:13:17 auroraeosrose Exp $ ARG_ENABLE('apache2handler', 'Build Apache 2.x handler', 'no'); if (PHP_APACHE2HANDLER != "no") { - if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2HANDLER", PHP_PHP_BUILD + "\\include\\apache2") && + if (PHP_ZTS == "no") { + WARNING("Apache2 module requires an --enable-zts build of PHP on windows"); + } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2HANDLER", PHP_PHP_BUILD + "\\include\\apache2") && CHECK_LIB("libhttpd.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") && CHECK_LIB("libapr.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") && CHECK_LIB("libaprutil.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") @@ -20,7 +22,9 @@ ARG_ENABLE('apache2-2handler', 'Build Apache 2.2.x handler', 'no'); if (PHP_APACHE2_2HANDLER != "no") { - if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_2HANDLER", PHP_PHP_BUILD + "\\include\\apache2_2") && + if (PHP_ZTS == "no") { + WARNING("Apache2 module requires an --enable-zts build of PHP on windows"); + } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_2HANDLER", PHP_PHP_BUILD + "\\include\\apache2_2") && CHECK_LIB("libhttpd.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") && CHECK_LIB("libapr-1.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") && CHECK_LIB("libaprutil-1.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") http://cvs.php.net/viewvc.cgi/php-src/sapi/isapi/config.w32?r1=1.4&r2=1.4.8.1&diff_format=u Index: php-src/sapi/isapi/config.w32 diff -u php-src/sapi/isapi/config.w32:1.4 php-src/sapi/isapi/config.w32:1.4.8.1 --- php-src/sapi/isapi/config.w32:1.4 Sat Jan 17 13:00:13 2004 +++ php-src/sapi/isapi/config.w32 Wed May 14 03:13:17 2008 @@ -1,13 +1,13 @@ // vim:ft=javascript -// $Id: config.w32,v 1.4 2004/01/17 13:00:13 sniper Exp $ +// $Id: config.w32,v 1.4.8.1 2008/05/14 03:13:17 auroraeosrose Exp $ ARG_ENABLE('isapi', 'Build ISAPI version of PHP', 'no'); if (PHP_ISAPI == "yes") { if (PHP_ZTS == "no") { - ERROR("ISAPI module requires an --enable-zts build of PHP"); + WARNING("ISAPI module requires an --enable-zts build of PHP"); + } else { + SAPI('isapi', 'php5isapi.c', 'php' + PHP_VERSION + 'isapi.dll', '/D PHP5ISAPI_EXPORTS'); + ADD_FLAG('LDFLAGS_ISAPI', '/DEF:sapi\\isapi\\php5isapi.def'); } - - SAPI('isapi', 'php5isapi.c', 'php' + PHP_VERSION + 'isapi.dll', '/D PHP5ISAPI_EXPORTS'); - ADD_FLAG('LDFLAGS_ISAPI', '/DEF:sapi\\isapi\\php5isapi.def'); } http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.10&r2=1.60.2.1.2.8.2.11&diff_format=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.10 php-src/win32/build/confutils.js:1.60.2.1.2.8.2.11 --- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.10 Mon Apr 14 17:55:02 2008 +++ php-src/win32/build/confutils.js Wed May 14 03:13:17 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.60.2.1.2.8.2.10 2008/04/14 17:55:02 sfox Exp $ +// $Id: confutils.js,v 1.60.2.1.2.8.2.11 2008/05/14 03:13:17 auroraeosrose Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -586,6 +586,17 @@ // libnames can be ; separated list of accepted library names libnames = libnames.split(';'); + // for debug builds, lib may have _debug appended, we want that first + if (PHP_DEBUG == "yes") { + var length = libnames.length; + for (var i = 0; i < length; i++) { + var name = new String(libnames[i]); + rExp = /.lib$/i; + name = name.replace(rExp,"_debug.lib"); + libnames.unshift(name); + } + } + var i, j, k, libname; var location = false; var path = path_to_check.split(';');