diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-04-15 21:52:17 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-04-15 21:52:17 +0000 |
| commit | 041ca1eee8ef07a22cdba0be0ab483ad559e9848 (patch) | |
| tree | b56f438cefdd7dbe5bf594677ac6a134697ab5f5 | |
| parent | ff04fd9476f7abd907e094c005e76dfbb7da0348 (diff) | |
| download | pango-041ca1eee8ef07a22cdba0be0ab483ad559e9848.tar.gz | |
Don't look for Xft unless we found FreeType. (#109753)
Tue Apr 15 05:47:35 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Don't look for Xft unless we found
FreeType. (#109753)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
| -rw-r--r-- | configure.in | 2 |
6 files changed, 26 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Apr 15 05:47:35 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't look for Xft unless we found + FreeType. (#109753) + Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_set_family): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 1ee2aecf..09200ac7 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +Tue Apr 15 05:47:35 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't look for Xft unless we found + FreeType. (#109753) + Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_set_family): diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 1ee2aecf..09200ac7 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +Tue Apr 15 05:47:35 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't look for Xft unless we found + FreeType. (#109753) + Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_set_family): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 1ee2aecf..09200ac7 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +Tue Apr 15 05:47:35 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't look for Xft unless we found + FreeType. (#109753) + Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_set_family): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 1ee2aecf..09200ac7 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +Tue Apr 15 05:47:35 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't look for Xft unless we found + FreeType. (#109753) + Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_set_family): diff --git a/configure.in b/configure.in index 9321032f..fd19ae3f 100644 --- a/configure.in +++ b/configure.in @@ -209,7 +209,7 @@ AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype && $have_fontconfig) # have_xft=false -if $have_x ; then +if $have_x && $have_freetype ; then PKG_CHECK_MODULES(XFT, xft >= 2.0.0, have_xft=true, :) fi |