diff options
| author | Christian Thalinger <twisti@complang.tuwien.ac.at> | 2006-03-06 10:19:29 +0000 |
|---|---|---|
| committer | Christian Thalinger <twisti@complang.tuwien.ac.at> | 2006-03-06 10:19:29 +0000 |
| commit | 7418f4b042fb641277697611d834cf70dcd5590c (patch) | |
| tree | a9e2b9f04e8f49f4cbbf24a876c802781ad976e5 /configure.ac | |
| parent | 1cbd6579fd2f2a4200a984f3e0b98f23671db6f9 (diff) | |
| download | classpath-7418f4b042fb641277697611d834cf70dcd5590c.tar.gz | |
2006-03-06 Christian Thalinger <twisti@complang.tuwien.ac.at>
* configure.ac: Check for FREETYPE2. This is a reverted patch and
is required on Darwin.
* native/jni/gtk-peer/Makefile.am (AM_LDFLAGS): Added FREETYPE2.
(AM_CFLAGS): Likewise.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index ff2c5a1db..10100c64a 100644 --- a/configure.ac +++ b/configure.ac @@ -377,12 +377,15 @@ if test "x${COMPILE_JNI}" = xyes; then PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0) fi + PKG_CHECK_MODULES(FREETYPE2, freetype2) PKG_CHECK_MODULES(PANGOFT2, pangoft2) - + AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) AC_SUBST(CAIRO_LIBS) AC_SUBST(CAIRO_CFLAGS) + AC_SUBST(FREETYPE2_LIBS) + AC_SUBST(FREETYPE2_CFLAGS) AC_SUBST(PANGOFT2_LIBS) AC_SUBST(PANGOFT2_CFLAGS) fi |