[Fontconfig] fontconfig: Branch 'master' - 2 commits

[Behdad Esfahbod]

 autogen.sh  |    2 +-
 src/fcxml.c |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 327fc9d183ba193c307d0ecaec8ad1f4e6ca1330
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jul 21 15:41:47 2009 -0400

    Use GetSystemWindowsDirectory() instead of GetWindowsDirectory() (#22037)

diff --git a/src/fcxml.c b/src/fcxml.c
index 9713e6b..9dc64e2 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -2099,10 +2099,10 @@ FcEndElement(void *userData, const XML_Char *name)
 		break;
 	    }
 	    FcMemAlloc (FC_MEM_STRING, 1000);
-	    rc = GetWindowsDirectory (data, 800);
+	    rc = GetSystemWindowsDirectory (data, 800);
 	    if (rc == 0 || rc > 800)
 	    {
-		FcConfigMessage (parse, FcSevereError, "GetWindowsDirectory failed");
+		FcConfigMessage (parse, FcSevereError, "GetSystemWindowsDirectory failed");
 		FcStrFree (data);
 		break;
 	    }
@@ -2142,7 +2142,7 @@ FcEndElement(void *userData, const XML_Char *name)
 	    rc = GetTempPath (800, data);
 	    if (rc == 0 || rc > 800)
 	    {
-		FcConfigMessage (parse, FcSevereError, "GetWindowsDirectory failed");
+		FcConfigMessage (parse, FcSevereError, "GetTempPath failed");
 		FcStrFree (data);
 		break;
 	    }
commit 86dd857447f69cf89fd47259055b150f62519c17
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jul 21 15:39:58 2009 -0400

    Improve libtool version parsing (#22122)

diff --git a/autogen.sh b/autogen.sh
index c3d11ca..820c457 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,7 +29,7 @@ DIE=0
 
 have_libtool=false
 if $LIBTOOLIZE --version < /dev/null > /dev/null 2>&1 ; then
-	libtool_version=`$LIBTOOLIZE --version | sed 's/^[^0-9]*\([0-9].[0-9.]*\).*/\1/'`
+	libtool_version=`$LIBTOOLIZE --version | sed 's/^.* \([0-9][.][0-9.]*\)[^ ]*$/\1/'`
 	case $libtool_version in
 	    1.4*|1.5*|1.6*|1.7*|2*)
 		have_libtool=true