X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libjava%2Fconfigure;h=01e5bf0dfc78b5e7d65c3350081c3de4f0a90e1f;hp=8ffc640c1c4ade24402dbe08b75bf942aea763a8;hb=dab866f9b5afc58f05be6ea553163865b7c5cabc;hpb=8c35d268c774a348c0e041c4e507137dabe98974 diff --git a/libjava/configure b/libjava/configure index 8ffc640c1c4..01e5bf0dfc7 100755 --- a/libjava/configure +++ b/libjava/configure @@ -674,6 +674,7 @@ GLIB_CFLAGS GTK_LIBS GTK_CFLAGS PKG_CONFIG +LDLIBICONV LTLIBICONV LIBICONV USING_GCC_FALSE @@ -785,6 +786,7 @@ TOOLKIT LIBGCJDEBUG BUILD_SUBLIBS_FALSE BUILD_SUBLIBS_TRUE +LIBGCJ_LD_EXPORT_ALL LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJ_LD_SYMBOLIC LIBGCJ_SUBLIB_CORE_EXTRA_DEPS @@ -958,6 +960,7 @@ enable_rpath with_libiconv_prefix enable_tls with_system_libunwind +enable_symvers with_python_dir enable_aot_compile_rpm enable_java_home @@ -1647,6 +1650,7 @@ Optional Features: --enable-java-gc=TYPE choose garbage collector (default is boehm) --disable-rpath do not hardcode runtime library paths --enable-tls Use thread-local storage [default=yes] + --disable-symvers disable symbol versioning for libjava --enable-aot-compile-rpm enable installation of aot-compile-rpm [default=no] --enable-java-home create a standard JDK-style directory layout in the @@ -5847,7 +5851,7 @@ fi # We need a jar that supports -@. This is a GNU extension. if test "$JAR" != no; then rm -f config-test.jar - echo $srcdir/configure.ac | $JAR -cf@ config-test.jar + echo $srcdir/configure.ac | $JAR -cf@ config-test.jar >/dev/null 2>&1 if test -f config-test.jar; then rm -f config-test.jar else @@ -5954,6 +5958,16 @@ if test -z "$libgcj_ld_symbolic"; then libgcj_ld_symbolic=$SYMBOLIC_LDFLAGS fi +# for windows native targets enforce export of all symbols for shared libgcj. +libgcj_ld_export_all= +case "$host" in + *mingw*) + libgcj_ld_export_all=-Wl,--export-all-symbols + ;; + *) + ;; +esac + LIBGCJ_CFLAGS="${libgcj_cflags}" LIBGCJ_CXXFLAGS="${libgcj_cxxflags}" LIBGCJ_JAVAFLAGS="${libgcj_javaflags}" @@ -5961,6 +5975,8 @@ LIBGCJ_SUBLIB_LTFLAGS="${libgcj_sublib_ltflags}" LIBGCJ_SUBLIB_CORE_EXTRA_DEPS="${libgcj_sublib_core_extra_deps}" LIBGCJ_LD_SYMBOLIC="${libgcj_ld_symbolic}" LIBGCJ_LD_SYMBOLIC_FUNCTIONS="${libgcj_ld_symbolic_functions}" +LIBGCJ_LD_EXPORT_ALL="${libgcj_ld_export_all}" + @@ -6174,10 +6190,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -11549,10 +11561,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -12474,10 +12482,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -13355,7 +13359,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13358 "configure" +#line 13362 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13461,7 +13465,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13464 "configure" +#line 13468 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16161,10 +16165,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -18521,10 +18521,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var_GCJ=no ;; - freebsd1*) - ld_shlibs_GCJ=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -19462,7 +19458,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 19465 "configure" +#line 19461 "configure" struct S { ~S(); }; void bar(); void foo() @@ -20557,6 +20553,9 @@ arm*linux*eabi) *-*-cygwin) extra_ldflags_libjava=-liconv ;; +*-*-mingw*) + extra_ldflags_libjava=-lws2_32 + ;; esac LIBMATHSPEC= @@ -20705,7 +20704,7 @@ $as_echo "#define LINUX_THREADS 1" >>confdefs.h ;; win32) ;; - decosf1 | irix | mach | os2 | solaris | dce | vxworks) + dce | vxworks) as_fn_error "thread package $THREADS not yet supported" "$LINENO" 5 ;; *) @@ -21993,6 +21992,8 @@ $as_echo "#define HAVE_TZNAME 1" >>confdefs.h fi fi + LDLIBICONV=`echo " $LIBICONV " | sed "s/${acl_cv_wl--Wl,}/ /g; s/,/ /g"` + for ac_func in gethostbyname_r do : @@ -23141,12 +23142,11 @@ fi if test "$GC" = boehm; then case "${host}" in mips-sgi-irix6*) - # IRIX 6 lacks a N64 libdl.so, but only the N32 (default multilib) - # libgcj.spec is used, so override here - SYSTEMSPEC="$SYSTEMSPEC %{!mabi=64:-ldl}" - ;; + # While IRIX 6 has libdl for the O32 and N32 ABIs, the N64 one is + # missing. It's unnecessary anyway since dlopen lives in libc. + ;; *-*-darwin*) - ;; + ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldl" >&5 $as_echo_n "checking for main in -ldl... " >&6; } @@ -23185,7 +23185,7 @@ if test "x$ac_cv_lib_dl_main" = x""yes; then : SYSTEMSPEC="$SYSTEMSPEC -ldl" fi - ;; + ;; esac fi fi @@ -24215,12 +24215,12 @@ SYSDEP_SOURCES= SIGNAL_HANDLER_AUX= case "${host}" in + alpha*-dec-osf* | mips-sgi-irix* | *-*-solaris2*) + SIGNAL_HANDLER=include/posix-signal.h + ;; i?86-*-linux*) SIGNAL_HANDLER=include/i386-signal.h ;; - *-*-solaris2*) - SIGNAL_HANDLER=include/solaris-signal.h - ;; # ia64-*) # SYSDEP_SOURCES=sysdep/ia64.c # test -d sysdep || mkdir sysdep @@ -24548,12 +24548,24 @@ $as_echo_n "checking whether ld supports anonymous version scripts... " >&6; } if test "${libjava_cv_anon_version_script+set}" = set; then : $as_echo_n "(cached) " >&6 else - save_CFLAGS="$CFLAGS"; save_LDFLAGS="$LDFLAGS" - libjava_cv_anon_version_script=no - CFLAGS="$CFLAGS -fPIC"; - LDFLAGS="$LDFLAGS -shared -Wl,--version-script,conftest.map" - echo '{ global: globalsymb*; local: *; };' > conftest.map - if test x$gcc_no_link = xyes; then + # Check whether --enable-symvers was given. +if test "${enable_symvers+set}" = set; then : + enableval=$enable_symvers; case "$enableval" in + yes) libjava_cv_anon_version_script=yes ;; + no) libjava_cv_anon_version_script=no ;; + *) as_fn_error "Unknown argument to enable/disable symvers" "$LINENO" 5;; + esac +else + libjava_cv_anon_version_script=yes + +fi + + if test x$libjava_cv_anon_version_script = xyes; then + save_CFLAGS="$CFLAGS"; save_LDFLAGS="$LDFLAGS" + CFLAGS="$CFLAGS -fPIC"; + LDFLAGS="$LDFLAGS -shared -Wl,--version-script,conftest.map" + echo '{ global: globalsymb*; local: *; };' > conftest.map + if test x$gcc_no_link = xyes; then as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -24569,17 +24581,19 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : libjava_cv_anon_version_script=gnu +else + libjava_cv_anon_version_script=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test x$libjava_cv_anon_version_script = xno; then - case "$target_os" in - solaris2*) - LDFLAGS="$save_LDFLAGS" - LDFLAGS="$LDFLAGS -shared -Wl,-M,conftest.map" - # Sun ld doesn't understand wildcards here. - echo '{ global: globalsymbol; local: *; };' > conftest.map - if test x$gcc_no_link = xyes; then + if test x$libjava_cv_anon_version_script = xno; then + case "$target_os" in + solaris2*) + LDFLAGS="$save_LDFLAGS" + LDFLAGS="$LDFLAGS -shared -Wl,-M,conftest.map" + # Sun ld doesn't understand wildcards here. + echo '{ global: globalsymbol; local: *; };' > conftest.map + if test x$gcc_no_link = xyes; then as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -24598,10 +24612,11 @@ if ac_fn_c_try_link "$LINENO"; then : fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - ;; - esac + ;; + esac + fi + CFLAGS="$save_CFLAGS"; LDFLAGS="$save_LDFLAGS" fi - CFLAGS="$save_CFLAGS"; LDFLAGS="$save_LDFLAGS" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libjava_cv_anon_version_script" >&5 @@ -24649,25 +24664,22 @@ here=`${PWDCMD-pwd}` # We get this from the environment. +default_python_dir="/share/gcc-`cat ${srcdir}/../gcc/BASE-VER`/python/libjava" # Check whether --with-python-dir was given. if test "${with_python_dir+set}" = set; then : withval=$with_python_dir; with_python_dir=$withval else - with_python_dir="" + with_python_dir="${default_python_dir}" fi -if test "x${with_python_dir}" = "x" -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="${expanded_prefix}/share/python" -else - python_mod_dir="\${prefix}${with_python_dir}" - python_mod_dir_expanded="${expanded_prefix}${with_python_dir}" -fi +# Needed for installing Python modules during make install. +python_mod_dir="\${prefix}${with_python_dir}" + +# Needed for substituting into aot-compile* +python_mod_dir_expanded="${expanded_prefix}${with_python_dir}" + { $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; };