Joel Holdsworth : configure: Fix for icotool version checking regex.
Alexandre Julliard
julliard at winehq.org
Mon May 17 09:39:28 CDT 2010
Module: wine
Branch: master
Commit: 9571f781fb62f272bbbc863d639941d3506328ef
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9571f781fb62f272bbbc863d639941d3506328ef
Author: Joel Holdsworth <joel at airwebreathe.org.uk>
Date: Sun May 16 23:07:33 2010 +0100
configure: Fix for icotool version checking regex.
---
configure | 4 ++--
configure.ac | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 2ab935b..fa0d59a 100755
--- a/configure
+++ b/configure
@@ -5121,8 +5121,8 @@ $as_echo_n "checking for recent enough icotool... " >&6; }
icotool_version=`icotool --version | head -n1`
if test "x$icotool_version" != "x"
then
- icotool_version_major=`expr "$icotool_version" : '.* \([0-9]*\).[0-9]*'`
- icotool_version_minor=`expr "$icotool_version" : '.* [0-9]*.\([0-9]*\)'`
+ icotool_version_major=`expr "$icotool_version" : '.* \([0-9]*\)\.[0-9]*'`
+ icotool_version_minor=`expr "$icotool_version" : '.* [0-9]*\.\([0-9]*\)'`
if test "$icotool_version_major" -eq 0 -a "$icotool_version_minor" -lt 29
then
ICOTOOL=false
diff --git a/configure.ac b/configure.ac
index df70de6..006a325 100644
--- a/configure.ac
+++ b/configure.ac
@@ -296,8 +296,8 @@ then
icotool_version=`icotool --version | head -n1`
if test "x$icotool_version" != "x"
then
- icotool_version_major=`expr "$icotool_version" : '.* \([[0-9]]*\).[[0-9]]*'`
- icotool_version_minor=`expr "$icotool_version" : '.* [[0-9]]*.\([[0-9]]*\)'`
+ icotool_version_major=`expr "$icotool_version" : '.* \([[0-9]]*\)\.[[0-9]]*'`
+ icotool_version_minor=`expr "$icotool_version" : '.* [[0-9]]*\.\([[0-9]]*\)'`
if test "$icotool_version_major" -eq 0 -a "$icotool_version_minor" -lt 29
then
ICOTOOL=false
More information about the wine-cvs
mailing list