diff options
| author | Keith Packard <keithp@keithp.com> | 2004-03-30 17:31:48 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2004-03-30 17:31:48 +0000 |
| commit | 0ede3c2fc1740a80551f8f36dfbe77071ca12bd9 (patch) | |
| tree | 0c8a2c8f459a435e5094a9f04286867866ff9c8f | |
| parent | 0b21fd7cc352086884c08161f14a49ade25253cf (diff) | |
Oops. Apply changes to configure.in needed to detect functions and
structures used in FcGetPixelSize.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 17 |
2 files changed, 19 insertions, 4 deletions
@@ -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 @@ 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 |