[poppler] poppler: ChangeLog, 1.157.2.6, 1.157.2.7 configure.ac, 1.28.2.1, 1.28.2.2

[Kristian Hogsberg]

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

Modified Files:
      Tag: POPPLER_0_4_X
	ChangeLog configure.ac 
Log Message:
2005-08-21  Kristian Høgsberg  <krh at redhat.com>

        * poppler/Makefile.am (INCLUDES): Add FREETYPE_CFLAGS.

        * configure.ac: Make freetype check use pkg-config if possible.



Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.157.2.6
retrieving revision 1.157.2.7
diff -u -d -r1.157.2.6 -r1.157.2.7
--- ChangeLog	16 Aug 2005 05:22:37 -0000	1.157.2.6
+++ ChangeLog	21 Aug 2005 23:12:39 -0000	1.157.2.7
@@ -1,3 +1,9 @@
+2005-08-21  Kristian Høgsberg  <krh at redhat.com>
+
+	* poppler/Makefile.am (INCLUDES): Add FREETYPE_CFLAGS.
+
+	* configure.ac: Make freetype check use pkg-config if possible.
+
 2005-08-16  Kristian Høgsberg  <krh at redhat.com>
 
 	* configure.ac: Bump version to 0.4.0.

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.28.2.1
retrieving revision 1.28.2.2
diff -u -d -r1.28.2.1 -r1.28.2.2
--- configure.ac	16 Aug 2005 05:22:37 -0000	1.28.2.1
+++ configure.ac	21 Aug 2005 23:12:39 -0000	1.28.2.2
@@ -144,17 +144,31 @@
 dnl Check for freetype headers
 FREETYPE_LIBS=
 FREETYPE_CFLAGS=
-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`
+FREETYPE_MIN_VERSION=9.5.3
+
+PKG_CHECK_MODULES(FREETYPE, freetype2 >= $FREETYPE_MIN_VERSION,
+                  [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, 1, [Defines if your system has the freetype library 2.1.7 or older])
 
-  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" -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])
+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