diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-10-24 16:43:32 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-10-24 16:43:32 +0000 |
| commit | d68b5255b5b313cf2f63584f1a46e23530592cf6 (patch) | |
| tree | a9b82c0074f9520554b71249f6d2f1ad28f5a55f /libjava/configure.ac | |
| parent | 30ab0a1063bf6d5b1125cf73add64ee69a41d00c (diff) | |
| download | gcc-d68b5255b5b313cf2f63584f1a46e23530592cf6.tar.gz | |
2009-10-24 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 153531
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@153533 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/configure.ac')
| -rw-r--r-- | libjava/configure.ac | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac index bfd33fd5154..be143c5b833 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -55,15 +55,15 @@ AC_ARG_ENABLE(version-specific-runtime-libs, [version_specific_libs=no] ) -AC_ARG_ENABLE(plugin, - AS_HELP_STRING([--enable-plugin], +AC_ARG_ENABLE(browser-plugin, + AS_HELP_STRING([--enable-browser-plugin], [build gcjwebplugin web browser plugin]), [case "$enableval" in - yes) plugin_enabled=yes ;; - no) plugin_enabled=no ;; - *) AC_MSG_ERROR([Unknown argument to enable/disable plugin]);; + yes) browser_plugin_enabled=yes ;; + no) browser_plugin_enabled=no ;; + *) AC_MSG_ERROR([Unknown argument to enable/disable browser plugin]);; esac], - [plugin_enabled=no] + [browser_plugin_enabled=no] ) AC_ARG_ENABLE(gconf-peer, @@ -491,8 +491,10 @@ 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" -if test "$plugin_enabled" != yes; then +if test "$browser_plugin_enabled" != yes; then ac_configure_args="$ac_configure_args --disable-plugin" +else + ac_configure_args="$ac_configure_args --enable-plugin" fi if test "$gconf_enabled" != yes; then ac_configure_args="$ac_configure_args --disable-gconf-peer" |