callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for FreeType using freetype-config, since we can't rely on Xft to

Browse Source 
Tue Dec 19 23:47:27 2000  Owen Taylor  <otaylor@redhat.com>

	* configure.in gdk/x11/Makefile.am: Check for FreeType
	using freetype-config, since we can't rely on Xft
	to pull in the libraries for us, or rely on it being
	in the default include path first.

	* gtk/gtkframe.c: Fix some problems where the gap wasn't
	being drawn in the right place, especially for right-aligned
	frame labels.

Thu Dec 14 21:02:59 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkfontsel.c (gtk_font_selection_select_font): Update
	the font_name entry as needed.
This commit is contained in:
Owen Taylor
2000-12-20 04:49:49 +00:00
committed by Owen Taylor
parent fb14db07bd
commit c7755bc949
4 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
configure.in
View File

@ -398,20 +398,40 @@ if test "x$gdktarget" = "xx11"; then
,
$x_libs)
#
# Checks for FreeType
#
FREETYPE_LIBS=
FREETYPE_CFLAGS=
have_freetype=false
AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
if test "x$FREE_CONFIG" != "xno" ; then
FREETYPE_CFLAGS=`freetype-config --cflags`
FREETYPE_LIBS=`freetype-config --libs`
AC_CHECK_LIB(freetype, FT_New_Face, have_freetype=true
,:,$FREETYPE_LIBS)
fi
AC_SUBST(FREETYPE_CFLAGS)
#
# Checks for Xft/XRender
#
#
have_xft=false
XFT_LIBS=""
AC_CHECK_LIB(Xrender, XRenderFindFormat,
AC_CHECK_LIB(Xft, XftFontOpen, have_xft=true, :, -lXrender $X_LIBS)
,:,-lXext $X_LIBS)
XFT_CFLAGS=""
if test $have_freetype = true ; then
AC_CHECK_LIB(Xrender, XRenderFindFormat,
AC_CHECK_LIB(Xft, XftFontOpen, have_xft=true, :, -lXrender -lXext $X_LIBS $FREETYPE_LIBS)
,:,-lXext $X_LIBS)
if $have_xft = 'true' ; then
X_LIBS="-lXft -lXrender -lXext $X_LIBS"
AC_DEFINE(HAVE_XFT)
if $have_xft = 'true' ; then
X_LIBS="-lXft -lXrender -lXext $FREETYPE_LIBS $X_LIBS"
AC_DEFINE(HAVE_XFT)
fi
fi
AC_SUBST(XFT_LIBS)
AM_CONDITIONAL(HAVE_XFT, $have_xft)
# Check for XIM support.