From c2d215165442cb0574d6c3e3a288de223b6eb0a4 Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Sat, 13 Aug 2005 02:47:24 +0000 Subject: [PATCH] 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. --- win32/build/config.w32 | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/win32/build/config.w32 b/win32/build/config.w32 index dece210b82..265098f719 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -109,15 +109,7 @@ DEFINE("PHP_LDFLAGS", "$(DLL_LDFLAGS)"); // 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 @@ function add_extra_dirs() 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); -- 2.40.0