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

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

Browse Source 
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.
This commit is contained in:
Owen Taylor
2002-06-04 21:55:29 +00:00
committed by Owen Taylor
parent 0219cc38d4
commit 9f224d08e9
7 changed files with 69 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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.

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
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.

8
ChangeLog.pre-2-2
View File

@ -1,3 +1,11 @@
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.

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
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.

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
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.

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
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.

20
configure.in
View File

@ -987,12 +987,15 @@ 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
have_xft=false
if $PKG_CONFIG --exists xft ; then
x_libs="`pkg-config --libs xft` -lX11 $FREETYPE_LIBS $X_EXTRA_LIBS"
have_xft=true
else
gtk_save_cppflags="$CPPFLAGS" gtk_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $x_cflags" CPPFLAGS="$CPPFLAGS $x_cflags"
have_xft=false
AC_CHECK_LIB(Xrender, XRenderFindFormat, AC_CHECK_LIB(Xrender, XRenderFindFormat,
[AC_CHECK_LIB(Xft, XftFontOpen, [AC_CHECK_LIB(Xft, XftFontOpen,
@ -1001,10 +1004,15 @@ if test "x$gdktarget" = "xx11"; then
:,-lXrender -lXext $x_libs $FREETYPE_LIBS)] :,-lXrender -lXext $x_libs $FREETYPE_LIBS)]
,:,-lXext $x_libs) ,:,-lXext $x_libs)
CPPFLAGS="$gtk_save_cppflags"
if $have_xft ; then if $have_xft ; then
x_libs="$X_LIBS -lXft -lXrender -lXext -lX11 $FREETYPE_LIBS $X_EXTRA_LIBS" x_libs="$X_LIBS -lXft -lXrender -lXext -lX11 $FREETYPE_LIBS $X_EXTRA_LIBS"
fi
CPPFLAGS="$gtk_save_cppflags"
fi
if $have_xft ; then
:
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
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