diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-02-12 22:23:40 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-02-12 22:23:40 +0000 |
| commit | 6125bdbebc6c6bafe79e3dc9f0c59b1cf8e43978 (patch) | |
| tree | 8ff6b924470ff9a22016dcacd00ccabd740b720d | |
| parent | 8131eed8524fe466d8a6cc440455791ea4083cf0 (diff) | |
| download | pango-6125bdbebc6c6bafe79e3dc9f0c59b1cf8e43978.tar.gz | |
If --without-x is specified, don't try to build Xft backend either.
Wed Feb 12 17:17:12 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: If --without-x is specified, don't
try to build Xft backend either. (#105210, patch
from Akira Tagoh)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | configure.in | 4 |
6 files changed, 33 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Wed Feb 12 17:17:12 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in: If --without-x is specified, don't + try to build Xft backend either. (#105210, patch + from Akira Tagoh) + Wed Feb 12 17:09:00 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c: Fix bug where language diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index fe792e1f..9adf72ec 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Wed Feb 12 17:17:12 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in: If --without-x is specified, don't + try to build Xft backend either. (#105210, patch + from Akira Tagoh) + Wed Feb 12 17:09:00 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c: Fix bug where language diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index fe792e1f..9adf72ec 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Wed Feb 12 17:17:12 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in: If --without-x is specified, don't + try to build Xft backend either. (#105210, patch + from Akira Tagoh) + Wed Feb 12 17:09:00 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c: Fix bug where language diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index fe792e1f..9adf72ec 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Wed Feb 12 17:17:12 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in: If --without-x is specified, don't + try to build Xft backend either. (#105210, patch + from Akira Tagoh) + Wed Feb 12 17:09:00 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c: Fix bug where language diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index fe792e1f..9adf72ec 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Wed Feb 12 17:17:12 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in: If --without-x is specified, don't + try to build Xft backend either. (#105210, patch + from Akira Tagoh) + Wed Feb 12 17:09:00 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c: Fix bug where language diff --git a/configure.in b/configure.in index cda482d6..c7e18bd8 100644 --- a/configure.in +++ b/configure.in @@ -180,7 +180,9 @@ AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype && $have_fontconfig) # have_xft=false -PKG_CHECK_MODULES(XFT, xft >= 2.0.0, have_xft=true, :) +if test "x$have_x" != "xfalse" ; then + PKG_CHECK_MODULES(XFT, xft >= 2.0.0, have_xft=true, :) +fi AC_SUBST(XFT_LIBS) AC_SUBST(XFT_CFLAGS) |