diff options
Diffstat (limited to 'libjava/configure')
| -rwxr-xr-x | libjava/configure | 95 |
1 files changed, 51 insertions, 44 deletions
diff --git a/libjava/configure b/libjava/configure index 95d21af1e5f..5eabcf573b3 100755 --- a/libjava/configure +++ b/libjava/configure @@ -1050,7 +1050,7 @@ enable_multilib with_cross_host with_newlib enable_version_specific_runtime_libs -enable_plugin +enable_browser_plugin enable_gconf_peer with_antlr_jar enable_gjdoc @@ -1739,7 +1739,7 @@ Optional Features: --enable-version-specific-runtime-libs specify that runtime libraries should be installed in a compiler-specific directory - --enable-plugin build gcjwebplugin web browser plugin + --enable-browser-plugin build gcjwebplugin web browser plugin --enable-gconf-peer compile GConf native peers for util.preferences --disable-gjdoc compile GJDoc (disabled by --disable-gjdoc) default=yes @@ -3363,15 +3363,15 @@ else fi -# Check whether --enable-plugin was given. -if test "${enable_plugin+set}" = set; then : - enableval=$enable_plugin; case "$enableval" in - yes) plugin_enabled=yes ;; - no) plugin_enabled=no ;; - *) as_fn_error "Unknown argument to enable/disable plugin" "$LINENO" 5;; +# Check whether --enable-browser-plugin was given. +if test "${enable_browser_plugin+set}" = set; then : + enableval=$enable_browser_plugin; case "$enableval" in + yes) browser_plugin_enabled=yes ;; + no) browser_plugin_enabled=no ;; + *) as_fn_error "Unknown argument to enable/disable browser plugin" "$LINENO" 5;; esac else - plugin_enabled=no + browser_plugin_enabled=no fi @@ -6705,9 +6705,14 @@ cat >>confdefs.h <<_ACEOF _ACEOF +expanded_prefix=$prefix +if test "X$prefix" = XNONE; then + expanded_prefix=${ac_default_prefix} +fi + cat >>confdefs.h <<_ACEOF -#define LIBGCJ_PREFIX "$prefix" +#define LIBGCJ_PREFIX "$expanded_prefix" _ACEOF @@ -6833,8 +6838,10 @@ 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" -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" @@ -7504,13 +7511,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:7507: $ac_compile\"" >&5) + (eval echo "\"\$as_me:7514: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:7510: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:7517: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:7513: output\"" >&5) + (eval echo "\"\$as_me:7520: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -8705,7 +8712,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 8708 "configure"' > conftest.$ac_ext + echo '#line 8715 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10639,11 +10646,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10642: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10649: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10646: \$? = $ac_status" >&5 + echo "$as_me:10653: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10978,11 +10985,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10981: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10988: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10985: \$? = $ac_status" >&5 + echo "$as_me:10992: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11083,11 +11090,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11086: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11093: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11090: \$? = $ac_status" >&5 + echo "$as_me:11097: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11138,11 +11145,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11141: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11148: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11145: \$? = $ac_status" >&5 + echo "$as_me:11152: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13547,7 +13554,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13550 "configure" +#line 13557 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13643,7 +13650,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13646 "configure" +#line 13653 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15605,11 +15612,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15608: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15615: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15612: \$? = $ac_status" >&5 + echo "$as_me:15619: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15704,11 +15711,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15707: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15714: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15711: \$? = $ac_status" >&5 + echo "$as_me:15718: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15756,11 +15763,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15759: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15766: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15763: \$? = $ac_status" >&5 + echo "$as_me:15770: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17172,11 +17179,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17175: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17182: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17179: \$? = $ac_status" >&5 + echo "$as_me:17186: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17505,11 +17512,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17508: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17515: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17512: \$? = $ac_status" >&5 + echo "$as_me:17519: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17604,11 +17611,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17607: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17614: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17611: \$? = $ac_status" >&5 + echo "$as_me:17618: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17656,11 +17663,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17659: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17666: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17663: \$? = $ac_status" >&5 + echo "$as_me:17670: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19258,7 +19265,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 19261 "configure" +#line 19268 "configure" struct S { ~S(); }; void bar(); void foo() @@ -22933,7 +22940,7 @@ if test ! -f gnu/classpath/Configuration.java; then test -d gnu || mkdir gnu test -d gnu/classpath || mkdir gnu/classpath # Note that it is not crucial that all the values here be correct. - sed -e "s,@prefix@,$prefix," \ + sed -e "s,@prefix@,$expanded_prefix," \ -e "s,@VERSION@,$VERSION," \ -e "s,@LIBDEBUG@,false," \ -e "s,@INIT_LOAD_LIBRARY@,false," \ @@ -24265,10 +24272,10 @@ then # Needed for installing Python modules during make install. python_mod_dir="\${prefix}/share/python" # Needed for substituting into aot-compile* - python_mod_dir_expanded="${prefix}/share/python" + python_mod_dir_expanded="${expanded_prefix}/share/python" else python_mod_dir="\${prefix}${with_python_dir}" - python_mod_dir_expanded="${prefix}${with_python_dir}" + python_mod_dir_expanded="${expanded_prefix}${with_python_dir}" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: Python modules dir: ${python_mod_dir_expanded}" >&5 $as_echo "Python modules dir: ${python_mod_dir_expanded}" >&6; }; @@ -24510,7 +24517,7 @@ $as_echo "arch directory: ${host_cpu}" >&6; } LIBDIR=$libdir if test "x${exec_prefix}" = "xNONE" then - lib_exec_prefix=$prefix + lib_exec_prefix=$expanded_prefix else lib_exec_prefix=$exec_prefix fi |