diff options
| author | Michael Natterer <mitch@convergence.de> | 2001-05-03 15:31:59 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2001-05-03 15:31:59 +0000 |
| commit | 188e75c8fe55553a4c8df10fcb6be04b187cdc92 (patch) | |
| tree | 3dcaf019076e882e3eb011618c6ddc0a758c8290 | |
| parent | 8dddc32ed9aa784bfd6403a0992dce21f6c3b069 (diff) | |
| download | pango-188e75c8fe55553a4c8df10fcb6be04b187cdc92.tar.gz | |
also check for the the Xft header.
2001-05-03 Michael Natterer <mitch@convergence.de>
* configure.in: also check for the the Xft header.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 4 | ||||
| -rw-r--r-- | configure.in | 5 |
8 files changed, 32 insertions, 1 deletions
@@ -1,3 +1,7 @@ +2001-05-03 Michael Natterer <mitch@convergence.de> + + * configure.in: also check for the the Xft header. + Wed May 2 11:35:16 2001 Owen Taylor <otaylor@redhat.com> * configure.in (have_freetype): Add check to make sure diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index a166c52a..95557af9 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,7 @@ +2001-05-03 Michael Natterer <mitch@convergence.de> + + * configure.in: also check for the the Xft header. + Wed May 2 11:35:16 2001 Owen Taylor <otaylor@redhat.com> * configure.in (have_freetype): Add check to make sure diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index a166c52a..95557af9 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,7 @@ +2001-05-03 Michael Natterer <mitch@convergence.de> + + * configure.in: also check for the the Xft header. + Wed May 2 11:35:16 2001 Owen Taylor <otaylor@redhat.com> * configure.in (have_freetype): Add check to make sure diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index a166c52a..95557af9 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,7 @@ +2001-05-03 Michael Natterer <mitch@convergence.de> + + * configure.in: also check for the the Xft header. + Wed May 2 11:35:16 2001 Owen Taylor <otaylor@redhat.com> * configure.in (have_freetype): Add check to make sure diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index a166c52a..95557af9 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,7 @@ +2001-05-03 Michael Natterer <mitch@convergence.de> + + * configure.in: also check for the the Xft header. + Wed May 2 11:35:16 2001 Owen Taylor <otaylor@redhat.com> * configure.in (have_freetype): Add check to make sure diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index a166c52a..95557af9 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,7 @@ +2001-05-03 Michael Natterer <mitch@convergence.de> + + * configure.in: also check for the the Xft header. + Wed May 2 11:35:16 2001 Owen Taylor <otaylor@redhat.com> * configure.in (have_freetype): Add check to make sure diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index a166c52a..95557af9 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,7 @@ +2001-05-03 Michael Natterer <mitch@convergence.de> + + * configure.in: also check for the the Xft header. + Wed May 2 11:35:16 2001 Owen Taylor <otaylor@redhat.com> * configure.in (have_freetype): Add check to make sure diff --git a/configure.in b/configure.in index 97abb3a6..ba376776 100644 --- a/configure.in +++ b/configure.in @@ -109,7 +109,10 @@ XFT_CFLAGS="" 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) + 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 = 'true' ; then |