diff options
Diffstat (limited to 'libjava/configure')
| -rwxr-xr-x | libjava/configure | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/libjava/configure b/libjava/configure index a30f34e16eb..17284a822e8 100755 --- a/libjava/configure +++ b/libjava/configure @@ -853,6 +853,7 @@ Optional Features: specify that runtime libraries should be installed in a compiler-specific directory --enable-multilib build many library versions (default) + --enable-plugin build gcjwebplugin web browser plugin --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-maintainer-mode enable make rules and dependencies not useful @@ -1607,6 +1608,21 @@ echo "$as_me: error: bad value ${enableval} for multilib option" >&2;} else multilib=yes fi; +# Check whether --enable-plugin or --disable-plugin was given. +if test "${enable_plugin+set}" = set; then + enableval="$enable_plugin" + case "$enableval" in + yes) plugin_enabled=yes ;; + no) plugin_enabled=no ;; + *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable plugin" >&5 +echo "$as_me: error: Unknown argument to enable/disable plugin" >&2;} + { (exit 1); exit 1; }; };; + esac +else + plugin_enabled=no + +fi; + # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. @@ -4985,6 +5001,8 @@ test -f libgcj.spec || touch libgcj.spec # Set up to configure Classpath. # FIXME: no supported way to pass args in autoconf. +ac_configure_args="$ac_configure_args --with-fastjar=$JAR" +ac_configure_args="$ac_configure_args --enable-tool-wrappers" ac_configure_args="$ac_configure_args --disable-load-library" ac_configure_args="$ac_configure_args --${LIBGCJDEBUG}-debug" ac_configure_args="$ac_configure_args --enable-default-toolkit=$TOOLKIT" @@ -4994,7 +5012,9 @@ ac_configure_args="$ac_configure_args --with-vm-classes=$dir1:$dir2" ac_configure_args="$ac_configure_args --disable-core-jni" 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 "$plugin_enabled" != yes; then + ac_configure_args="$ac_configure_args --disable-plugin" +fi if test "$use_gtk_awt" != yes; then ac_configure_args="$ac_configure_args --disable-gtk-peer" fi @@ -5817,7 +5837,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 5820 "configure"' > conftest.$ac_ext + echo '#line 5840 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6820,7 +6840,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : else cat > conftest.$ac_ext << EOF -#line 6823 "configure" +#line 6843 "configure" struct S { ~S(); }; void bar(); void foo() |
