diff options
| author | Sven Neumann <sven@convergence.de> | 2001-05-02 14:28:15 +0000 |
|---|---|---|
| committer | Sven Neumann <neo@src.gnome.org> | 2001-05-02 14:28:15 +0000 |
| commit | 071af17799791f216db170770da8bef479fffa7c (patch) | |
| tree | 057f808d555b4e66751391bd694462c1dfa85d32 | |
| parent | 54dee9a070383e0e36db7f96b53620507d10e3a4 (diff) | |
| download | pango-071af17799791f216db170770da8bef479fffa7c.tar.gz | |
do not try to build modules using Xft if X is not available or was
2001-05-02 Sven Neumann <sven@convergence.de>
* configure.in: do not try to build modules using Xft if X is not
available or was explicitely disabled.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 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 | 16 |
8 files changed, 44 insertions, 7 deletions
@@ -1,3 +1,8 @@ +2001-05-02 Sven Neumann <sven@convergence.de> + + * configure.in: do not try to build modules using Xft if X is not + available or was explicitely disabled. + Tue May 1 23:30:53 2001 Owen Taylor <otaylor@redhat.com> * modules/hangul/hangul-x.c (hangul_engine_shape): Fix numeric diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 4724a4f3..0d5e5618 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,8 @@ +2001-05-02 Sven Neumann <sven@convergence.de> + + * configure.in: do not try to build modules using Xft if X is not + available or was explicitely disabled. + Tue May 1 23:30:53 2001 Owen Taylor <otaylor@redhat.com> * modules/hangul/hangul-x.c (hangul_engine_shape): Fix numeric diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 4724a4f3..0d5e5618 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2001-05-02 Sven Neumann <sven@convergence.de> + + * configure.in: do not try to build modules using Xft if X is not + available or was explicitely disabled. + Tue May 1 23:30:53 2001 Owen Taylor <otaylor@redhat.com> * modules/hangul/hangul-x.c (hangul_engine_shape): Fix numeric diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 4724a4f3..0d5e5618 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,8 @@ +2001-05-02 Sven Neumann <sven@convergence.de> + + * configure.in: do not try to build modules using Xft if X is not + available or was explicitely disabled. + Tue May 1 23:30:53 2001 Owen Taylor <otaylor@redhat.com> * modules/hangul/hangul-x.c (hangul_engine_shape): Fix numeric diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 4724a4f3..0d5e5618 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +2001-05-02 Sven Neumann <sven@convergence.de> + + * configure.in: do not try to build modules using Xft if X is not + available or was explicitely disabled. + Tue May 1 23:30:53 2001 Owen Taylor <otaylor@redhat.com> * modules/hangul/hangul-x.c (hangul_engine_shape): Fix numeric diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 4724a4f3..0d5e5618 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +2001-05-02 Sven Neumann <sven@convergence.de> + + * configure.in: do not try to build modules using Xft if X is not + available or was explicitely disabled. + Tue May 1 23:30:53 2001 Owen Taylor <otaylor@redhat.com> * modules/hangul/hangul-x.c (hangul_engine_shape): Fix numeric diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 4724a4f3..0d5e5618 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +2001-05-02 Sven Neumann <sven@convergence.de> + + * configure.in: do not try to build modules using Xft if X is not + available or was explicitely disabled. + Tue May 1 23:30:53 2001 Owen Taylor <otaylor@redhat.com> * modules/hangul/hangul-x.c (hangul_engine_shape): Fix numeric diff --git a/configure.in b/configure.in index 54893cfb..e9c7523c 100644 --- a/configure.in +++ b/configure.in @@ -87,13 +87,15 @@ AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype) have_xft=false XFT_LIBS="" XFT_CFLAGS="" -if test $have_freetype = true ; then - AC_CHECK_LIB(Xrender, XRenderFindFormat, - AC_CHECK_LIB(Xft, XftFontOpen, have_xft=true, :, -lXrender -lXext $X_LIBS $FREETYPE_LIBS) - ,:,-lXext $X_LIBS) - - if $have_xft = 'true' ; then - XFT_LIBS="-lXft -lXrender -lXext $X_LIBS $FREETYPE_LIBS" +if test $have_x = true ; then + if test $have_freetype = true ; then + AC_CHECK_LIB(Xrender, XRenderFindFormat, + AC_CHECK_LIB(Xft, XftFontOpen, have_xft=true, :, -lXrender -lXext $X_LIBS $FREETYPE_LIBS) + ,:,-lXext $X_LIBS) + + if $have_xft = 'true' ; then + XFT_LIBS="-lXft -lXrender -lXext $X_LIBS $FREETYPE_LIBS" + fi fi fi |