diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2005-11-27 21:00:34 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2005-11-27 21:00:34 +0000 |
| commit | 15ee25b923180850794e71cc44c9859e65eea8a2 (patch) | |
| tree | 5115c5c9f0dacfbeb537decc2bcb25ef362e039f /configure.ac | |
| parent | 6f383d9c78e81a535c35c5e69df90cd5a4d1dbfa (diff) | |
| download | classpath-15ee25b923180850794e71cc44c9859e65eea8a2.tar.gz | |
2005-11-27 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD --> generics from the release of Classpath 0.19
to 2005/11/27.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 2e6778a08..ce9449a25 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl ----------------------------------------------------------- dnl define([AC_CACHE_LOAD], )dnl dnl define([AC_CACHE_SAVE], )dnl -AC_INIT([GNU Classpath],[0.19-generics],[classpath@gnu.org],[classpath]) +AC_INIT([GNU Classpath],[0.20-generics-pre],[classpath@gnu.org],[classpath]) AC_CONFIG_SRCDIR(java/lang/System.java) AC_CANONICAL_TARGET @@ -118,7 +118,7 @@ AM_CONDITIONAL(CREATE_ALSA_LIBRARIES, test "x${COMPILE_ALSA}" = xyes) dnl ----------------------------------------------------------- dnl DSSI code (enabled by default) dnl ----------------------------------------------------------- -AC_ARG_ENABLE([alsa], +AC_ARG_ENABLE([dssi], [AS_HELP_STRING(--disable-dssi,compile DSSI providers (enable by --enable-dssi) [default=yes])], [case "${enableval}" in yes) COMPILE_DSSI=yes ;; @@ -353,7 +353,6 @@ if test "x${COMPILE_JNI}" = xyes; then fi PKG_CHECK_MODULES(PANGOFT2, pangoft2) - PKG_CHECK_MODULES(FREETYPE2, freetype2) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) @@ -361,8 +360,6 @@ if test "x${COMPILE_JNI}" = xyes; then AC_SUBST(CAIRO_CFLAGS) AC_SUBST(PANGOFT2_LIBS) AC_SUBST(PANGOFT2_CFLAGS) - AC_SUBST(FREETYPE2_LIBS) - AC_SUBST(FREETYPE2_CFLAGS) fi dnl Check for AWT related Qt4 |