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

List:       kde-commits
Subject:    KDE/kdegraphics/kpdf
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2005-10-24 21:55:06
Message-ID: 1130190906.280391.13611.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 473888 by aacid:

Remove HAVE_FREETYPE_217_OR_OLDER as that is detected on runtime now, add a note to \
warn all that freetype < 2.1.10 users that  a upgrade to 2.1.10 can help kpdf


 M  +10 -0     configure.in.bot  
 M  +3 -8      configure.in.in  


--- trunk/KDE/kdegraphics/kpdf/configure.in.bot #473887:473888
@@ -5,6 +5,15 @@
   echo ""
 fi
 
+if test x$FREETYPE_VERSION != x; then
+  if test $FREETYPE_VERSION -lt 9008003; then
+    echo ""
+    echo "You're are using freetype older than 2.1.10, it is not mandatory"
+    echo "to use 2.1.10 but kpdf improves its rendering in some pdf with it"
+    echo ""
+  fi
+fi
+
 if test -z "$XFT_LIBS"; then
   echo ""
   echo "You're missing XFT development libs."
@@ -18,3 +27,4 @@
   echo "KPDF will not be build without them"
   echo ""
 fi
+
--- trunk/KDE/kdegraphics/kpdf/configure.in.in #473887:473888
@@ -7,8 +7,8 @@
 ])
 
 if test -n "$FREETYPE_CONFIG"; then
-  vers=`$FREETYPE_CONFIG --version 2>/dev/null | sed -e 's/libfreetype //' | awk \
                'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-  if test -n "$vers" && test "$vers" -ge 9000000; then
+  FREETYPE_VERSION=`$FREETYPE_CONFIG --version 2>/dev/null | sed -e 's/libfreetype \
//' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +  if \
test -n "$FREETYPE_VERSION" && test "$FREETYPE_VERSION" -ge 9000000; then  \
LIBFREETYPE_LIBS="`$FREETYPE_CONFIG --libs`"  LIBFREETYPE_RPATH=
     for args in $LIBFREETYPE_LIBS; do
@@ -19,12 +19,6 @@
     LIBFREETYPE_RPATH=`echo $LIBFREETYPE_RPATH | sed -e "s/-L/-R/g"`
     LIBFREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`"
     AC_DEFINE_UNQUOTED(HAVE_FREETYPE, 1, [Defines if your system has the freetype \
                library])
-    if test -n "$vers" && test "$vers" -le 9005003; then
-	    AC_DEFINE_UNQUOTED(HAVE_FREETYPE_217_OR_OLDER, 1, [Defines if your system has \
                the freetype library 2.1.7 or older])
-    else
-	    AC_DEFINE_UNQUOTED(HAVE_FREETYPE_217_OR_OLDER, 0, [Defines if your system has \
                the freetype library 2.1.7 or older])
-    fi
-	    
   else
     AC_MSG_WARN([You need at least libfreetype 2.0.5])
     DO_NOT_COMPILE="$DO_NOT_COMPILE kpdf"
@@ -33,6 +27,7 @@
   DO_NOT_COMPILE="$DO_NOT_COMPILE kpdf"
 fi
 
+AC_SUBST(FREETYPE_VERSION)
 AC_SUBST(LIBFREETYPE_LIBS)
 AC_SUBST(LIBFREETYPE_CFLAGS)
 AC_SUBST(LIBFREETYPE_RPATH)


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