diff options
| author | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-06-10 07:09:17 +0000 |
|---|---|---|
| committer | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-06-10 07:09:17 +0000 |
| commit | ddb6babb253043f6c990ba72249608b268af62f0 (patch) | |
| tree | 91d4b1ea0237855d9e6ab5eba3e2694472c04cd3 /libjava/configure.ac | |
| parent | b5d5a0616ed49627e790fb7973e951dbcf1c23c7 (diff) | |
| download | gcc-ddb6babb253043f6c990ba72249608b268af62f0.tar.gz | |
2006-06-10 Thomas Fitzsimmons <fitzsim@redhat.com>
* configure.ac (ac_configure_args): Add --disable-plugin.
(--enable-gtk-cairo): Remove option.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114540 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/configure.ac')
| -rw-r--r-- | libjava/configure.ac | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac index e12af738dcf..1c0e0adc86e 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -330,6 +330,7 @@ ac_configure_args="$ac_configure_args --disable-core-jni" dnl FIXME? ac_configure_args="$ac_configure_args --disable-examples" ac_configure_args="$ac_configure_args --with-glibj=build" +ac_configure_args="$ac_configure_args --disable-plugin" if test "$use_gtk_awt" != yes; then ac_configure_args="$ac_configure_args --disable-gtk-peer" fi @@ -676,21 +677,6 @@ AC_SUBST(ZLIBTESTSPEC) AC_PATH_XTRA -# determine whether to enable the cairo GTK Graphics2D backend -AC_ARG_ENABLE(gtk-cairo, - AS_HELP_STRING([--enable-gtk-cairo], - [build the cairo Graphics2D implementation on GTK])) -AM_CONDITIONAL(GTK_CAIRO, test "x${enable_gtk_cairo}" = xyes) -if test "x${enable_gtk_cairo}" = xyes -then - PKG_CHECK_MODULES(CAIRO, cairo) - PKG_CHECK_MODULES(PANGOFT2, pangoft2) -fi -AC_SUBST(CAIRO_LIBS) -AC_SUBST(CAIRO_CFLAGS) -AC_SUBST(PANGOFT2_LIBS) -AC_SUBST(PANGOFT2_CFLAGS) - # FIXME: this should be _libs on some hosts. libsubdir=.libs |