[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kcontrol/kfontinst
From:       Scott Wheeler <wheeler () kde ! org>
Date:       2004-11-15 10:57:38
Message-ID: 20041115105738.A068E16D76 () office ! kde ! org
[Download RAW message or body]

CVS commit by wheeler: 

Since the code checked in this weekend seems to require fontconfig v2.2 
don't try to compile it if there's a lower version around.  I'm not sure
this is a good thing (requiring the latest version), but well, building is
good.

CCMAIL:craig@kde.org


  M +2 -2      configure.in.in   1.24


--- kdebase/kcontrol/kfontinst/configure.in.in  #1.23:1.24
@@ -45,5 +45,5 @@
     if test -n "$PKGCONFIG"; then
         vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | sed -e \
's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * \
                1000 + $3;}'`
-        if test -n "$vers" && test "$vers" -ge 1000000 ; then
+        if test -n "$vers" && test "$vers" -ge 2002000 ; then
             LIBFONTCONFIG_LIBS="`$PKGCONFIG fontconfig --libs`"
             LIBFONTCONFIG_RPATH=
@@ -63,5 +63,5 @@
     if test -n "$FONTCONFIG_CONFIG"; then
         vers=`$FONTCONFIG_CONFIG --version 2>/dev/null | sed -e 's/libfontconfig //' \
                | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + \
                $3;}'`
-        if test -n "$vers" && test "$vers" -ge 1000000 ; then
+        if test -n "$vers" && test "$vers" -ge 2002000 ; then
             LIBFONTCONFIG_LIBS="`$FONTCONFIG_CONFIG --libs`"
             LIBFONTCONFIG_RPATH=


[prev in list] [next in list] [prev in thread] [next in thread]