From c584f3d9a8e9dec113d9036729a6fbee77d4976f Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 24 Oct 2013 13:15:17 +0200 Subject: Fix check for ICU on MinGW Newer ICU versions do not generate a .lib file any more ... Also the check doesn't take e.g. static debug builds into account. Instead of trying to enumerate all possible variations, just rely on the header check. That's what we're doing for the other libs, too. Change-Id: Idc0527f0e8ad90f298337d4ab635c7aa6a35c351 Reviewed-by: Jonathan Liu Reviewed-by: Friedemann Kleint Reviewed-by: Oswald Buddenhagen --- tools/configure/configureapp.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index c3382a5e0a..15c35a630f 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2103,9 +2103,7 @@ 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") || findFile("sicuin.lib") - || findFile("libicuin.lib") || findFile("libsicuin.lib")); // "lib" prefix for mingw, 's' prefix for static + available = findFile("unicode/utypes.h") && findFile("unicode/ucol.h") && findFile("unicode/ustring.h"); else if (part == "ANGLE") { available = checkAngleAvailability(); -- cgit v1.2.3