minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

Improve autotool version checking to work with beta releases.

This commit is contained in:
suzuki toshiya 2010-02-13 02:25:04 +09:00
parent 93eaf50aae
commit ad6954a0cb
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2010-02-12 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
Improve autotool version checking to work with beta releases.
* autogen.sh (check_tool_version): Improve the extraction of version
number from "tool --version" output. Some beta releases of autotools
have extra strings before version number.
2010-02-12 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
Fix overallocating bug in FT_Outline_New_Internal().

5
autogen.sh
View File

@ -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."