Oops. Apply changes to configure.in needed to detect functions and

    structures used in FcGetPixelSize.

diff --git a/ChangeLog b/ChangeLog
index ee2b48474cb2bebe7c3b16b1123e5b80c01ab3bc..9f301f8f7c916ec5c3c08ac68ba03f15fa8761b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-30  Keith Packard  <keithp@keithp.com>
+
+       * configure.in:
+       Oops.  Apply changes to configure.in needed to detect
+       functions and structures used in FcGetPixelSize.
+
 2004-03-30  Keith Packard  <keithp@keithp.com>
 
        * doc/Makefile.am:

diff --git a/configure.in b/configure.in
index 75912d9fe2fd872f5295541b3073046d5e77755b..e5071a7e30de7bf52ed697b6ec53dd3fc50f7076 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -117,9 +117,19 @@ AC_SUBST(FREETYPE_CFLAGS)
 #
 
 fontconfig_save_libs=$LIBS
+fontconfig_save_cflags="$CFLAGS"
 LIBS="$LIBS $FREETYPE_LIBS"
-AC_CHECK_FUNCS(FT_Get_First_Char)
-LIBS=$fontconfig_save_libs
+CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
+AC_CHECK_FUNCS(FT_Get_First_Char FT_Get_Next_Char FT_Get_BDF_Property)
+AC_CHECK_MEMBER(FT_Bitmap_Size.y_ppem,
+               HAVE_FT_BITMAP_SIZE_Y_PPEM=1,
+               HAVE_FT_BITMAP_SIZE_Y_PPEM=0,
+[#include <ft2build.h>
+#include FT_FREETYPE_H])
+AC_DEFINE_UNQUOTED(HAVE_FT_BITMAP_SIZE_Y_PPEM,$HAVE_FT_BITMAP_SIZE_Y_PPEM,
+                  [FT_Bitmap_Size structure includes y_ppem field])
+CFLAGS="$fontconfig_save_cflags"
+LIBS="$fontconfig_save_libs"
 
 #
 # Check expat configuration
@@ -293,8 +303,7 @@ case "$FC_ADD_FONTS" in
 "")
        ;;
 *)
-       FC_FONTPATH=`echo $FC_ADD_FONTS | 
-                       sed -e 's/^/<dir>/' -e 's/$/<\/dir>/' -e 's/,/<\/dir> <dir>/g'`
+       FC_FONTPATH=`echo $FC_ADD_FONTS | sed -e 's/^/<dir>/' -e 's/$/<\/dir>/' -e 's/,/<\/dir> <dir>/g'`
        ;;
 esac