[poppler] poppler: ChangeLog,1.195,1.196 configure.ac,1.35,1.36

[Albert Astals Cid]

Update of /cvs/poppler/poppler
In directory gabe:/tmp/cvs-serv13288

Modified Files:
	ChangeLog configure.ac 
Log Message:
Merge the xpdf 3.01 change that uses runtime detection of freetype version


Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- ChangeLog	15 Sep 2005 12:32:25 -0000	1.195
+++ ChangeLog	15 Sep 2005 22:09:50 -0000	1.196
@@ -1,3 +1,9 @@
+2005-09-16  Albert Astals Cid  <aacid at kde.org>
+	* configure.ac
+	* splash/SplashFTFontEngine.[cc|h]
+	* poppler/CairoFontEngine.[cc|h]: Merge the xpdf 3.01 change that uses
+	runtime detection of freetype version
+
 2005-09-15  Albert Astals Cid  <aacid at kde.org>
 	* poppler/: Some minor merges from xpdf 3.01
 

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- configure.ac	7 Sep 2005 03:00:36 -0000	1.35
+++ configure.ac	15 Sep 2005 22:09:50 -0000	1.36
@@ -131,31 +131,23 @@
 dnl Check for freetype headers
 FREETYPE_LIBS=
 FREETYPE_CFLAGS=
-FREETYPE_MIN_VERSION=9.5.3
 
-PKG_CHECK_MODULES(FREETYPE, freetype2 >= $FREETYPE_MIN_VERSION,
+PKG_CHECK_MODULES(FREETYPE, freetype2,
                   [freetype_pkgconfig=yes], [freetype_pkgconfig=no])
 
 if test "x$freetype_pkgconfig" = "xyes"; then
 
   AC_DEFINE(HAVE_FREETYPE_H, 1, [Have FreeType2 include files])
-  AC_DEFINE_UNQUOTED(HAVE_FREETYPE_217_OR_OLDER, 0, [Defines if your system has the freetype library 2.1.7 or older])
 
 else
 
   AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
   if test "x$FREETYPE_CONFIG" != "xno" ; then
+	  
     FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
     FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
     AC_DEFINE(HAVE_FREETYPE_H, 1, [Have FreeType2 include files])
-  
-    vers=`$FREETYPE_CONFIG --version 2>/dev/null | sed -e 's/libfreetype //' | awk 'BEGIN { FS = "."; } { printf "%d", $1 * 10000 + $2 * 100 + $3;}'`
-    min_vers=`echo $FREETYPE_MIN_VERSION | awk 'BEGIN { FS = "."; } { printf "%d", $1 * 10000 + $2 * 100 + $3;}'`
-    if test -n "$vers" && test "$vers" -le $min_vers; 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
+
   fi
 
 fi