Oops. Apply changes to configure.in needed to detect functions and
structures used in FcGetPixelSize.
This commit is contained in:
parent
0b21fd7cc3
commit
0ede3c2fc1
|
@ -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>
|
2004-03-30 Keith Packard <keithp@keithp.com>
|
||||||
|
|
||||||
* doc/Makefile.am:
|
* doc/Makefile.am:
|
||||||
|
|
17
configure.in
17
configure.in
|
@ -117,9 +117,19 @@ AC_SUBST(FREETYPE_CFLAGS)
|
||||||
#
|
#
|
||||||
|
|
||||||
fontconfig_save_libs=$LIBS
|
fontconfig_save_libs=$LIBS
|
||||||
|
fontconfig_save_cflags="$CFLAGS"
|
||||||
LIBS="$LIBS $FREETYPE_LIBS"
|
LIBS="$LIBS $FREETYPE_LIBS"
|
||||||
AC_CHECK_FUNCS(FT_Get_First_Char)
|
CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
|
||||||
LIBS=$fontconfig_save_libs
|
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
|
# Check expat configuration
|
||||||
|
@ -293,8 +303,7 @@ case "$FC_ADD_FONTS" in
|
||||||
"")
|
"")
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
FC_FONTPATH=`echo $FC_ADD_FONTS |
|
FC_FONTPATH=`echo $FC_ADD_FONTS | sed -e 's/^/<dir>/' -e 's/$/<\/dir>/' -e 's/,/<\/dir> <dir>/g'`
|
||||||
sed -e 's/^/<dir>/' -e 's/$/<\/dir>/' -e 's/,/<\/dir> <dir>/g'`
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue