blob: 94fbd1dff96064d4fb5aec96a139281b2f6c3877 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
--- configure
+++ configure
@@ -18430,44 +18430,6 @@
as_fn_error $? "ICU support not found - please install development ICU package" "$LINENO" 5
fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -licuuc" >&5
-$as_echo_n "checking for main in -licuuc... " >&6; }
-if ${ac_cv_lib_icuuc_main+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-licuuc $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-
-int
-main ()
-{
-return main ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_icuuc_main=yes
-else
- ac_cv_lib_icuuc_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_main" >&5
-$as_echo "$ac_cv_lib_icuuc_main" >&6; }
-if test "x$ac_cv_lib_icuuc_main" = xyes; then :
- ICU_OK=yes
-else
- as_fn_error $? "ICU support not found - please install development ICU package" "$LINENO" 5
-fi
-
-
if test "$TOMBUILD" = "Y"; then
MATHLIB=-ltommath
else
--- src/common/unicode_util.cpp
+++ src/common/unicode_util.cpp
@@ -55,8 +55,13 @@
namespace {
#if defined(WIN_NT)
+#if defined(MSVC_USE_DEBUG_RUNTIME)
+const char* const inTemplate = "icuind%s.dll";
+const char* const ucTemplate = "icuucd%s.dll";
+#else
const char* const inTemplate = "icuin%s.dll";
const char* const ucTemplate = "icuuc%s.dll";
+#endif
#elif defined(DARWIN)
const char* const inTemplate = "lib/libicui18n.%s.dylib";
const char* const ucTemplate = "lib/libicuuc.%s.dylib";
|
