Oops. Apply changes to configure.in needed to detect functions and
structures used in FcGetPixelSize.
diff --git a/ChangeLog b/ChangeLog
index ee2b484..9f301f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
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:
Fix --disable-doc mode code to locate built documents in ${srcdir}
instead of ${builddir}
diff --git a/configure.in b/configure.in
index 75912d9..e5071a7 100644
--- a/configure.in
+++ b/configure.in
@@ -117,9 +117,19 @@
#
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 @@
"")
;;
*)
- 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
