aboutsummaryrefslogtreecommitdiff
path: root/libjava/configure.ac
diff options
context:
space:
mode:
authorThomas Fitzsimmons <fitzsim@redhat.com>2006-06-10 07:09:17 +0000
committerThomas Fitzsimmons <fitzsim@gcc.gnu.org>2006-06-10 07:09:17 +0000
commit348cf02888a5b523dc4efc1a4a6f9bdd36be3cd8 (patch)
tree91d4b1ea0237855d9e6ab5eba3e2694472c04cd3 /libjava/configure.ac
parent410fce929b899a1c228e71f9decfd23918390a48 (diff)
downloadgcc-348cf02888a5b523dc4efc1a4a6f9bdd36be3cd8.zip
gcc-348cf02888a5b523dc4efc1a4a6f9bdd36be3cd8.tar.gz
gcc-348cf02888a5b523dc4efc1a4a6f9bdd36be3cd8.tar.bz2
configure.ac (ac_configure_args): Add --disable-plugin.
2006-06-10 Thomas Fitzsimmons <fitzsim@redhat.com> * configure.ac (ac_configure_args): Add --disable-plugin. (--enable-gtk-cairo): Remove option. * configure: Regenerate. From-SVN: r114540
Diffstat (limited to 'libjava/configure.ac')
-rw-r--r--libjava/configure.ac16
1 files changed, 1 insertions, 15 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac
index e12af73..1c0e0ad 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