From 9f224d08e9d82aa0a9c0d7941ebda312ad325ac9 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 4 Jun 2002 21:55:29 +0000 Subject: [PATCH] If we have xft .pc file, use that when checking for Xft/Xrender. (Still Tue Jun 4 17:39:34 2002 Owen Taylor * 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. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ configure.in | 34 +++++++++++++++++++++------------- 7 files changed, 69 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48b42b420d..e901e53d99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Jun 4 17:39:34 2002 Owen Taylor + + * 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 * gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 48b42b420d..e901e53d99 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Tue Jun 4 17:39:34 2002 Owen Taylor + + * 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 * gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 48b42b420d..e901e53d99 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Tue Jun 4 17:39:34 2002 Owen Taylor + + * 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 * gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 48b42b420d..e901e53d99 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Tue Jun 4 17:39:34 2002 Owen Taylor + + * 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 * gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 48b42b420d..e901e53d99 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Tue Jun 4 17:39:34 2002 Owen Taylor + + * 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 * gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 48b42b420d..e901e53d99 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Tue Jun 4 17:39:34 2002 Owen Taylor + + * 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 * gtk/gtktreeview.[ch]: added gtk_tree_view_expand_to_path. diff --git a/configure.in b/configure.in index 1dd346e058..ff0dcaca53 100644 --- a/configure.in +++ b/configure.in @@ -987,24 +987,32 @@ if test "x$gdktarget" = "xx11"; then # # Checks for Xft/XRender # - XFT_LIBS="" - XFT_CFLAGS="" if test $have_xft = true ; then - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $x_cflags" have_xft=false - 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 $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" + 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 - x_libs="$X_LIBS -lXft -lXrender -lXext -lX11 $FREETYPE_LIBS $X_EXTRA_LIBS" + : else AC_MSG_ERROR([pangoxft Pango backend found, but Xft not found]) fi @@ -1271,7 +1279,7 @@ fi if test "x$gdktarget" = "xx11"; then if $have_xft = true ; then - PANGO_PACKAGES="pangox pangoxft" + PANGO_PACKAGES="pangoxft pangox" else PANGO_PACKAGES=pangox fi