Commit 9f224d08 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

If we have xft .pc file, use that when checking for Xft/Xrender. (Still

Tue Jun  4 17:39:34 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in: If we have xft .pc file, use that
        when checking for Xft/Xrender. (Still need to separate
        out HAVE_XFT, HAVE_RENDER)

        * configure.in: Make sure Xft cflags come before X cflags.
parent 0219cc38
Tue Jun 4 17:39:34 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: If we have xft .pc file, use that
when checking for Xft/Xrender. (Still need to separate
out HAVE_XFT, HAVE_RENDER)
* configure.in: Make sure Xft cflags come before X cflags.
Tue Jun 4 21:13:57 2002 Kristian Rietveld <kris@gtk.org> Tue Jun 4 21:13:57 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path. * gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path.
......
Tue Jun 4 17:39:34 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: If we have xft .pc file, use that
when checking for Xft/Xrender. (Still need to separate
out HAVE_XFT, HAVE_RENDER)
* configure.in: Make sure Xft cflags come before X cflags.
Tue Jun 4 21:13:57 2002 Kristian Rietveld <kris@gtk.org> Tue Jun 4 21:13:57 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path. * gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path.
......
Tue Jun 4 17:39:34 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: If we have xft .pc file, use that
when checking for Xft/Xrender. (Still need to separate
out HAVE_XFT, HAVE_RENDER)
* configure.in: Make sure Xft cflags come before X cflags.
Tue Jun 4 21:13:57 2002 Kristian Rietveld <kris@gtk.org> Tue Jun 4 21:13:57 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path. * gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path.
......
Tue Jun 4 17:39:34 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: If we have xft .pc file, use that
when checking for Xft/Xrender. (Still need to separate
out HAVE_XFT, HAVE_RENDER)
* configure.in: Make sure Xft cflags come before X cflags.
Tue Jun 4 21:13:57 2002 Kristian Rietveld <kris@gtk.org> Tue Jun 4 21:13:57 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path. * gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path.
......
Tue Jun 4 17:39:34 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: If we have xft .pc file, use that
when checking for Xft/Xrender. (Still need to separate
out HAVE_XFT, HAVE_RENDER)
* configure.in: Make sure Xft cflags come before X cflags.
Tue Jun 4 21:13:57 2002 Kristian Rietveld <kris@gtk.org> Tue Jun 4 21:13:57 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path. * gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path.
......
Tue Jun 4 17:39:34 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: If we have xft .pc file, use that
when checking for Xft/Xrender. (Still need to separate
out HAVE_XFT, HAVE_RENDER)
* configure.in: Make sure Xft cflags come before X cflags.
Tue Jun 4 21:13:57 2002 Kristian Rietveld <kris@gtk.org> Tue Jun 4 21:13:57 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path. * gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path.
......
...@@ -987,24 +987,32 @@ if test "x$gdktarget" = "xx11"; then ...@@ -987,24 +987,32 @@ if test "x$gdktarget" = "xx11"; then
# #
# Checks for Xft/XRender # Checks for Xft/XRender
# #
XFT_LIBS=""
XFT_CFLAGS=""
if test $have_xft = true ; then if test $have_xft = true ; then
gtk_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $x_cflags"
have_xft=false have_xft=false
AC_CHECK_LIB(Xrender, XRenderFindFormat, if $PKG_CONFIG --exists xft ; then
[AC_CHECK_LIB(Xft, XftFontOpen, x_libs="`pkg-config --libs xft` -lX11 $FREETYPE_LIBS $X_EXTRA_LIBS"
[AC_CHECK_HEADER(X11/Xft/XftFreetype.h, have_xft=true
have_xft=true,:)], else
:,-lXrender -lXext $x_libs $FREETYPE_LIBS)] gtk_save_cppflags="$CPPFLAGS"
,:,-lXext $x_libs) CPPFLAGS="$CPPFLAGS $x_cflags"
AC_CHECK_LIB(Xrender, XRenderFindFormat,
[AC_CHECK_LIB(Xft, XftFontOpen,
[AC_CHECK_HEADER(X11/Xft/XftFreetype.h,
have_xft=true,:)],
:,-lXrender -lXext $x_libs $FREETYPE_LIBS)]
,:,-lXext $x_libs)
if $have_xft ; then
x_libs="$X_LIBS -lXft -lXrender -lXext -lX11 $FREETYPE_LIBS $X_EXTRA_LIBS"
fi
CPPFLAGS="$gtk_save_cppflags" CPPFLAGS="$gtk_save_cppflags"
fi
if $have_xft ; then if $have_xft ; then
x_libs="$X_LIBS -lXft -lXrender -lXext -lX11 $FREETYPE_LIBS $X_EXTRA_LIBS" :
else else
AC_MSG_ERROR([pangoxft Pango backend found, but Xft not found]) AC_MSG_ERROR([pangoxft Pango backend found, but Xft not found])
fi fi
...@@ -1271,7 +1279,7 @@ fi ...@@ -1271,7 +1279,7 @@ fi
if test "x$gdktarget" = "xx11"; then if test "x$gdktarget" = "xx11"; then
if $have_xft = true ; then if $have_xft = true ; then
PANGO_PACKAGES="pangox pangoxft" PANGO_PACKAGES="pangoxft pangox"
else else
PANGO_PACKAGES=pangox PANGO_PACKAGES=pangox
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment