From fb46b00eef0de80f05cb21b719057bacf059dbbf Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 26 Sep 2012 11:05:45 +0200 Subject: Configure.exe: Fix auto-detection of ICU for MinGW If one compiles ICU with MinGW the .lib files also have a lib prefix. Take this into account when checking for ICU availability. Upstream bug report: http://bugs.icu-project.org/trac/ticket/9603 Change-Id: Ia1ca49053b0ab41de45eec13799d94d5e934c42e Reviewed-by: Friedemann Kleint --- tools/configure/configureapp.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/configure') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index fb8ccdb99c..85002e3a66 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1968,7 +1968,8 @@ bool Configure::checkAvailability(const QString &part) available = findFile("pcre.h"); else if (part == "ICU") - available = findFile("unicode/utypes.h") && findFile("unicode/ucol.h") && findFile("unicode/ustring.h") && findFile("icuin.lib"); + available = findFile("unicode/utypes.h") && findFile("unicode/ucol.h") && findFile("unicode/ustring.h") + && (findFile("icuin.lib") || findFile("libicuin.lib")); // libicun.lib if compiled with mingw else if (part == "LIBJPEG") available = findFile("jpeglib.h"); -- cgit v1.2.3