diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-10-21 19:26:53 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2005-10-21 19:26:53 +0000 |
| commit | 0fadd6d7012f67a6ca1f6ec9fe1c5a59aac53752 (patch) | |
| tree | e1a67e9148f580fd0eae03ae4ed340573853b6e5 /configure.ac | |
| parent | 9909e8be3e783377cd1477a2adc91ef8ae1d83e0 (diff) | |
| download | classpath-0fadd6d7012f67a6ca1f6ec9fe1c5a59aac53752.tar.gz | |
2005-10-21 Christian Thalinger <twisti@complang.tuwien.ac.at>
* configure.ac: Also check for pangoft2 without cairo and
additionally check for freetype2.
* native/jni/gtk-peer/Makefile.am: Added X, pangoft2 and
freetype2 CFLAGS and LDFLAGS.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 63b145d38..be7317c95 100644 --- a/configure.ac +++ b/configure.ac @@ -373,12 +373,17 @@ fi if test "x${enable_gtk_cairo}" = xyes; then PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0) - PKG_CHECK_MODULES(PANGOFT2, pangoft2) fi + + PKG_CHECK_MODULES(PANGOFT2, pangoft2) + PKG_CHECK_MODULES(FREETYPE2, freetype2) + AC_SUBST(CAIRO_LIBS) AC_SUBST(CAIRO_CFLAGS) AC_SUBST(PANGOFT2_LIBS) AC_SUBST(PANGOFT2_CFLAGS) + AC_SUBST(FREETYPE2_LIBS) + AC_SUBST(FREETYPE2_CFLAGS) fi CLASSPATH_WITH_JAVAH |