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

List:       kde-commits
Subject:    kdebase/kcontrol/kfontinst
From:       Craig Drummond <craig () kde ! org>
Date:       2005-02-22 23:09:39
Message-ID: 20050222230939.8B8BDED8A () office ! kde ! org
[Download RAW message or body]

CVS commit by craig: 

Require FontConfig >=2. Looks like FcInitReinitialize crashes on FC 1.x :-(


  M +2 -2      configure.in.in   1.28


--- kdebase/kcontrol/kfontinst/configure.in.in  #1.27:1.28
@@ -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 1000001 ; then
+        if test -n "$vers" && test "$vers" -ge 2000000 ; 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 1000001 ; then
+        if test -n "$vers" && test "$vers" -ge 2000000 ; then
             LIBFONTCONFIG_LIBS="`$FONTCONFIG_CONFIG --libs`"
             LIBFONTCONFIG_RPATH=


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