[PHP-CVS] cvs: php-src /win32/build config.w32

[Wez Furlong]

wez             Fri Aug 12 22:47:25 2005 EDT

  Modified files:              
    /php-src/win32/build        config.w32 
  Log:
  make the icu library detection more friendly.
  Also note that we can only probe for libraries after we've set up the
  implicit php_build path.
  
  
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.46&r2=1.47&ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.46 php-src/win32/build/config.w32:1.47
--- php-src/win32/build/config.w32:1.46 Fri Aug 12 16:05:19 2005
+++ php-src/win32/build/config.w32      Fri Aug 12 22:47:24 2005
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.46 2005/08/12 20:05:19 wez Exp $
+// $Id: config.w32,v 1.47 2005/08/13 02:47:24 wez Exp $
 // "Master" config file; think of it as a configure.in
 // equivalent.
 
@@ -109,15 +109,7 @@
 // urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib 
comdlg32.lib 
 DEFINE("LIBS", "kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib 
ws2_32.lib");
 
-// Do we want static ICU lib
-ARG_ENABLE('static-icu', 'Link against the static version of the ICU library', 
'no');
-if (PHP_STATIC_ICU == "yes") {
-       ADD_FLAG("LIBS", "sicuuc.lib sicuin.lib sicuio.lib sicule.lib 
siculx.lib sicudt.lib");
-       ADD_FLAG("CFLAGS", "/D U_STATIC_IMPLEMENTATION=1")
-} else {
-       ADD_FLAG("LIBS", "icuuc.lib icuin.lib icuio.lib icule.lib iculx.lib");
-}
-       
+
 // Set some debug/release specific options
 if (PHP_DEBUG == "yes") {
        ADD_FLAG("CFLAGS", "/LDd /MDd /Gm /ZI /Od /GZ /D _DEBUG /D 
ZEND_DEBUG=1");
@@ -233,8 +225,26 @@
 
 probe_basic_headers();
 add_extra_dirs();
+
+// We can't probe for libs before this line
+
 CHECK_LIB("resolv.lib");
 
+// Do we want static ICU lib
+ARG_WITH('static-icu', 'Link against the static version of the ICU library', 
'no');
+if (PHP_STATIC_ICU == "yes") {
+       if (!CHECK_LIB('sicuuc.lib', null, PHP_STATIC_ICU)) {
+               ERROR('static ICU library not found');
+       }
+       ADD_FLAG("LIBS", "sicuuc.lib sicuin.lib sicuio.lib sicule.lib 
siculx.lib sicudt.lib");
+       ADD_FLAG("CFLAGS", "/D U_STATIC_IMPLEMENTATION=1")
+} else {
+       if (!CHECK_LIB('icuuc.lib', null)) {
+               ERROR('ICU library not found');
+       }
+       ADD_FLAG("LIBS", "icuuc.lib icuin.lib icuio.lib icule.lib iculx.lib");
+}
+       
 //DEFINE("PHP_BUILD", PHP_PHP_BUILD);
 
 STDOUT.WriteBlankLines(1);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php