diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-12 09:53:17 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-12 09:53:17 +0000 |
| commit | 29b86f9852b2b7ecc31cdfee56679537e40bc6e2 (patch) | |
| tree | 1e6ec8ccf2dbf773260a1953b8e13c49f9b7c5f5 /freetype/autogen.sh | |
| parent | 529236591df7366479a6fac30b387667678fd1ba (diff) | |
| download | vcxsrv-29b86f9852b2b7ecc31cdfee56679537e40bc6e2.tar.gz vcxsrv-29b86f9852b2b7ecc31cdfee56679537e40bc6e2.tar.bz2 vcxsrv-29b86f9852b2b7ecc31cdfee56679537e40bc6e2.zip | |
svn merge -r524:HEAD "^/branches/released" .
Diffstat (limited to 'freetype/autogen.sh')
| -rw-r--r-- | freetype/autogen.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/freetype/autogen.sh b/freetype/autogen.sh index 16c335fd5..c28a51c13 100644 --- a/freetype/autogen.sh +++ b/freetype/autogen.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005, 2006, 2007, 2008, 2009 by +# Copyright 2005, 2006, 2007, 2008, 2009, 2010 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -95,10 +95,11 @@ compare_to_minimum_version () check_tool_version () { field=$5 + # assume the output of "[TOOL] --version" is "toolname (GNU toolname foo bar) version" if test "$field"x = x; then - field=4 # default to 4 for all GNU autotools + field=3 # default to 3 for all GNU autotools, after filtering enclosed string fi - version=`$1 --version | head -1 | cut -d ' ' -f $field` + version=`$1 --version | head -1 | sed 's/([^)]*)/()/g' | cut -d ' ' -f $field` version_check=`compare_to_minimum_version $version $4` if test "$version_check"x = 0x; then echo "ERROR: Your version of the \`$2' tool is too old." |