diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-05-02 15:39:00 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-05-02 15:39:00 +0000 |
| commit | 8dddc32ed9aa784bfd6403a0992dce21f6c3b069 (patch) | |
| tree | f926b8a808d79fe36a4c653fe887e17d119f0acb | |
| parent | 071af17799791f216db170770da8bef479fffa7c (diff) | |
| download | pango-8dddc32ed9aa784bfd6403a0992dce21f6c3b069.tar.gz | |
Add check to make sure #include FT_ERRORS_H works. (#54043)
Wed May 2 11:35:16 2001 Owen Taylor <otaylor@redhat.com>
* configure.in (have_freetype): Add check to make sure
#include FT_ERRORS_H works. (#54043)
* 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 | 19 |
8 files changed, 47 insertions, 7 deletions
@@ -1,4 +1,7 @@ -2001-05-02 Sven Neumann <sven@convergence.de> +Wed May 2 11:35:16 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in (have_freetype): Add check to make sure + #include FT_ERRORS_H works. (#54043) * configure.in: do not try to build modules using Xft if X is not available or was explicitely disabled. diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 0d5e5618..a166c52a 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,4 +1,7 @@ -2001-05-02 Sven Neumann <sven@convergence.de> +Wed May 2 11:35:16 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in (have_freetype): Add check to make sure + #include FT_ERRORS_H works. (#54043) * configure.in: do not try to build modules using Xft if X is not available or was explicitely disabled. diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 0d5e5618..a166c52a 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,4 +1,7 @@ -2001-05-02 Sven Neumann <sven@convergence.de> +Wed May 2 11:35:16 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in (have_freetype): Add check to make sure + #include FT_ERRORS_H works. (#54043) * configure.in: do not try to build modules using Xft if X is not available or was explicitely disabled. diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 0d5e5618..a166c52a 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,4 +1,7 @@ -2001-05-02 Sven Neumann <sven@convergence.de> +Wed May 2 11:35:16 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in (have_freetype): Add check to make sure + #include FT_ERRORS_H works. (#54043) * configure.in: do not try to build modules using Xft if X is not available or was explicitely disabled. diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 0d5e5618..a166c52a 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,4 +1,7 @@ -2001-05-02 Sven Neumann <sven@convergence.de> +Wed May 2 11:35:16 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in (have_freetype): Add check to make sure + #include FT_ERRORS_H works. (#54043) * configure.in: do not try to build modules using Xft if X is not available or was explicitely disabled. diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 0d5e5618..a166c52a 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,4 +1,7 @@ -2001-05-02 Sven Neumann <sven@convergence.de> +Wed May 2 11:35:16 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in (have_freetype): Add check to make sure + #include FT_ERRORS_H works. (#54043) * configure.in: do not try to build modules using Xft if X is not available or was explicitely disabled. diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 0d5e5618..a166c52a 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,4 +1,7 @@ -2001-05-02 Sven Neumann <sven@convergence.de> +Wed May 2 11:35:16 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in (have_freetype): Add check to make sure + #include FT_ERRORS_H works. (#54043) * configure.in: do not try to build modules using Xft if X is not available or was explicitely disabled. diff --git a/configure.in b/configure.in index e9c7523c..97abb3a6 100644 --- a/configure.in +++ b/configure.in @@ -76,6 +76,25 @@ if test "x$FREETYPE_CONFIG" != "xno" ; then AC_CHECK_LIB(freetype, FT_New_Face, have_freetype=true ,:,$FREETYPE_LIBS) + + if $have_freetype ; then + pango_save_cflags="$CFLAGS" + CFLAGS="$CFLAGS $FREETYPE_CFLAGS" + + AC_MSG_CHECKING([For sufficiently new FreeType (at least 2.0.1)]) + AC_TRY_COMPILE([ +#include <freetype/freetype.h> +#include FT_ERRORS_H +] + ,[(void)1;],:,have_freetype=false) + if $have_freetype ; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + + CFLAGS="$pango_save_cflags" + fi fi AC_SUBST(FREETYPE_LIBS) AC_SUBST(FREETYPE_CFLAGS) |