wez Sat Jun 4 21:39:08 2005 EDT
Modified files:
/php-src/win32/build config.w32
Log:
tweaks for a recent addition to cygwin
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.37&r2=1.38&ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.37 php-src/win32/build/config.w32:1.38
--- php-src/win32/build/config.w32:1.37 Thu Feb 24 19:20:19 2005
+++ php-src/win32/build/config.w32 Sat Jun 4 21:39:07 2005
@@ -1,23 +1,34 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.37 2005/02/25 00:20:19 edink Exp $
+// $Id: config.w32,v 1.38 2005/06/05 01:39:07 wez Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
ARG_WITH('cygwin', 'Path to cygwin utilities on your system', '\\cygwin');
-
PATH_PROG('cl');
-PATH_PROG('link');
+
+// cygwin now ships with link.exe. Avoid searching the cygwin path
+// for this, as we want the MS linker, not the fileutil
+PATH_PROG('link', WshShell.Environment("Process").Item("PATH"));
+
PATH_PROG('nmake');
+
// we don't want to define LIB, as that will override the default library path
// that is set in that env var
PATH_PROG('lib', null, 'MAKE_LIB');
-PATH_PROG('bison');
-PATH_PROG('flex');
+if (!PATH_PROG('bison')) {
+ ERROR('bison is required')
+}
+if (!PATH_PROG('flex')) {
+ ERROR('flex is required')
+}
PATH_PROG('re2c');
PATH_PROG('zip');
PATH_PROG('lemon');
+
+// avoid picking up midnight commander from cygwin
PATH_PROG('mc', WshShell.Environment("Process").Item("PATH"));
+
ARG_ENABLE('debug', 'Compile with debugging symbols', "no");
ARG_ENABLE('debug-pack', 'Release binaries with external debug symbols
(--enable-debug must not be specified)', 'no');
if (PHP_DEBUG == "yes" && PHP_DEBUG_PACK == "yes") {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
