From bc79c6274151ecf561ac0b2691d9724f39e2045b Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 12 Jun 2002 22:58:58 +0000 Subject: [PATCH] check that pango has Xft2 support, instead of checking whether Xft2 2002-06-12 Havoc Pennington * configure.in: check that pango has Xft2 support, instead of checking whether Xft2 exists. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ configure.in | 2 +- 7 files changed, 31 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 377b61e306..0c55d8d601 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-06-12 Havoc Pennington + + * configure.in: check that pango has Xft2 support, instead of + checking whether Xft2 exists. + Wed Jun 12 17:46:53 2002 Owen Taylor * gtk/gtkentry.c (blink_cb): Add an informative diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 377b61e306..0c55d8d601 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-06-12 Havoc Pennington + + * configure.in: check that pango has Xft2 support, instead of + checking whether Xft2 exists. + Wed Jun 12 17:46:53 2002 Owen Taylor * gtk/gtkentry.c (blink_cb): Add an informative diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 377b61e306..0c55d8d601 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-06-12 Havoc Pennington + + * configure.in: check that pango has Xft2 support, instead of + checking whether Xft2 exists. + Wed Jun 12 17:46:53 2002 Owen Taylor * gtk/gtkentry.c (blink_cb): Add an informative diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 377b61e306..0c55d8d601 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-06-12 Havoc Pennington + + * configure.in: check that pango has Xft2 support, instead of + checking whether Xft2 exists. + Wed Jun 12 17:46:53 2002 Owen Taylor * gtk/gtkentry.c (blink_cb): Add an informative diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 377b61e306..0c55d8d601 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-06-12 Havoc Pennington + + * configure.in: check that pango has Xft2 support, instead of + checking whether Xft2 exists. + Wed Jun 12 17:46:53 2002 Owen Taylor * gtk/gtkentry.c (blink_cb): Add an informative diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 377b61e306..0c55d8d601 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-06-12 Havoc Pennington + + * configure.in: check that pango has Xft2 support, instead of + checking whether Xft2 exists. + Wed Jun 12 17:46:53 2002 Owen Taylor * gtk/gtkentry.c (blink_cb): Add an informative diff --git a/configure.in b/configure.in index 0ce1cd10e1..10cf015fd3 100644 --- a/configure.in +++ b/configure.in @@ -988,7 +988,7 @@ if test "x$gdktarget" = "xx11"; then if test $have_xft = true ; then have_xft=false - if $PKG_CONFIG --exists xft ; then + if pkg-config --exists pangoxft '>=' 1.1.0 ; then x_libs="`pkg-config --libs xft` -lX11 $FREETYPE_LIBS $X_EXTRA_LIBS" have_xft=true else