cpp/openttd-patchpack/source Changeset - r19317:bb90f9299b07

Changeset - r19317:bb90f9299b07

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

planetmaker - 12 years ago 2012-05-09 19:13:34
planetmaker@openttd.org

(svn r24220) -Change: Adopt ICU version detection to also deal with the new versioning scheme since ICU 49

1 file changed with 1 insertions and 1 deletions:

config.lib

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -2855,25 +2855,25 @@ detect_icu() { @@
 		icu_config=""
 		return 0
 	fi
 	if [ "$with_icu" = "1" ] || [ "$with_icu" = "" ] || [ "$with_icu" = "2" ]; then
 		icu_config="icu-config"
 	else
 		icu_config="$with_icu"
 	fi
 	version=`$icu_config --version 2>/dev/null`
 	ret=$?
-	shortversion=`echo $version | cut -c 1,3`
+	shortversion=`echo $version | cut -d\. -f1,2 | sed "s/\.//g" | cut -c1-2`
 	log 2 "executing $icu_config --version"
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -lt "36" ]; then
 		if [ -n "$shortversion" ] && [ "$shortversion" -lt "36" ]; then
 			log 1 "checking libicu... needs at least version 3.6.0, icu NOT enabled"
 		else
 			log 1 "checking libicu... not found"
 		fi
 		# It was forced, so it should be found.

0 comments (0 inline, 0 general)