This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: some more installation bits dropped
- From: Matthias Klose <doko at cs dot tu-berlin dot de>
- To: tromey at redhat dot com
- Cc: java at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org, java-patches at gcc dot gnu dot org, Thomas Fitzsimmons <fitzsim at redhat dot com>
- Date: Thu, 11 Jan 2007 01:01:49 +0100
- Subject: Re: some more installation bits dropped
- References: <17829.492.950940.788581@gargle.gargle.HOWL> <m3y7oaobk9.fsf@localhost.localdomain>
Tom Tromey writes:
> >>>>> "Matthias" == Matthias Klose <doko@cs.tu-berlin.de> writes:
>
> Matthias> it seems that the classpath part of r116332 was dropped; currently
> Matthias> checking the current missing bits:
>
> Thanks for finding this. I tried the patch and it worked for
> me... please check it in.
two additional chunks from r115839 were missing; checked in the
following patch. Note that CLASSPATH_TOOLEXECLIBDIR is not included
in libjava/classpath/aclocal.m4 (same as on the gcc-4_2-branch).
Matthias
2007-01-10 Matthias Klose <doko@debian.org>
Readd missing chunks from r116332:
* m4/acinclude.m4 (CLASSPATH_TOOLEXECLIBDIR): New macro.
* resource/Makefile.am (loggingdir): Define to
toolexeclibdir.
(securitydir): Likewise.
* configure.ac: Call CLASSPATH_TOOLEXECLIBDIR.
Set default nativeexeclibdir using toolexeclibdir.
Readd missing chunks from r115839:
* native/jni/gtk-peer/Makefile.am (libgtkpeer_la_LDFLAGS):
Add -avoid-version.
* native/jawt/Makefile.am (libjawt_la_LDFLAGS): Add -avoid-version.
* configure, Makefile.in, doc/Makefile.in, doc/api/Makefile.in,
examples/Makefile.in, external/Makefile.in,
external/jsr166/Makefile.in, external/relaxngDatatype/Makefile.in,
external/sax/Makefile.in, external/w3c_dom/Makefile.in,
include/Makefile.in, lib/Makefile.in, native/Makefile.in,
native/fdlibm/Makefile.in, native/jawt/Makefile.in,
native/jni/Makefile.in, native/jni/classpath/Makefile.in,
native/jni/gconf-peer/Makefile.in, native/jni/gtk-peer/Makefile.in
native/jni/java-io/Makefile.in, native/jni/java-lang/Makefile.in,
native/jni/java-net/Makefile.in, native/jni/java-nio/Makefile.in,
native/jni/java-util/Makefile.in, native/jni/midi-alsa/Makefile.in,
native/jni/midi-dssi/Makefile.in, native/jni/native-lib/Makefile.in,
native/jni/qt-peer/Makefile.in, native/jni/xmlj/Makefile.in,
native/plugin/Makefile.in, resource/Makefile.in, scripts/Makefile.in,
tools/Makefile.in: Regenerate
Index: m4/acinclude.m4
===================================================================
--- m4/acinclude.m4 (revision 120647)
+++ m4/acinclude.m4 (working copy)
@@ -458,3 +458,16 @@
AC_PATH_PROG(ECJ, "ecj")
fi
])
+
+dnl -----------------------------------------------------------
+dnl GCJ LOCAL: Calculate toolexeclibdir
+dnl -----------------------------------------------------------
+AC_DEFUN([CLASSPATH_TOOLEXECLIBDIR],
+[
+ multi_os_directory=`$CC -print-multi-os-directory`
+ case $multi_os_directory in
+ .) toolexeclibdir=${libdir} ;; # Avoid trailing /.
+ *) toolexeclibdir=${libdir}/${multi_os_directory} ;;
+ esac
+ AC_SUBST(toolexeclibdir)
+])
Index: configure
===================================================================
--- configure (revision 120647)
+++ configure (working copy)
@@ -312,7 +312,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE LIBVERSION CLASSPATH_MODULE CLASSPATH_CONVENIENCE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CREATE_COLLECTIONS_TRUE CREATE_COLLECTIONS_FALSE CREATE_JNI_LIBRARIES_TRUE CREATE_JNI_LIBRARIES_FALSE CREATE_CORE_JNI_LIBRARIES_TRUE CREATE_CORE_JNI_LIBRARIES_FALSE CREATE_GCONF_PEER_LIBRARIES_TRUE CREATE_GCONF_PEER_LIBRARIES_FALSE default_toolkit CREATE_XMLJ_LIBRARY_TRUE CREATE_XMLJ_LIBRARY_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP CREATE_ALSA_LIBRARIES_TRUE CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE CREATE_GTK_PEER_LIBRARIES_FALSE CREATE_QT_PEER_LIBRARIES_TRUE CREATE_QT_PEER_LIBRARIES_FALSE CREATE_PLUGIN_TRUE CREATE_PLUGIN_FALSE nativeexeclibdir glibjdir VM_BINARY FOUND_CACAO_TRUE FOUND_CACAO_FALSE CREATE_JNI_HEADERS_TRUE CREATE_JNI_HEADERS_FALSE CREATE_WRAPPERS_TRUE CREATE_WRAPPERS_FALSE LN_S RANLIB ac_ct_RANLIB LIBTOOL CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP PERL COLLECTIONS_PREFIX LIBMAGIC LIBICONV LTLIBICONV WARNING_CFLAGS STRICT_WARNING_CFLAGS ERROR_CFLAGS PKG_CONFIG XML_CFLAGS XML_LIBS XSLT_CFLAGS XSLT_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CFLAGS GTK_LIBS FREETYPE2_CFLAGS FREETYPE2_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS XTEST_LIBS GCONF_CFLAGS GCONF_LIBS GDK_CFLAGS GDK_LIBS QT_CFLAGS QT_LIBS MOC MOZILLA_CFLAGS MOZILLA_LIBS GLIB_CFLAGS GLIB_LIBS PLUGIN_DIR USER_JAVAH USER_SPECIFIED_JAVAH_TRUE USER_SPECIFIED_JAVAH_FALSE CLASSPATH_INCLUDES GCJ JIKES JIKESENCODING JIKESWARNINGS KJC GCJX ECJ FOUND_GCJ_TRUE FOUND_GCJ_FALSE FOUND_JIKES_TRUE FOUND_JIKES_FALSE FOUND_ECJ_TRUE FOUND_ECJ_FALSE FOUND_KJC_TRUE FOUND_KJC_FALSE FOUND_GCJX_TRUE FOUND_GCJX_FALSE USER_CLASSLIB USER_SPECIFIED_CLASSLIB_TRUE USER_SPECIFIED_CLASSLIB_FALSE vm_classes MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBDEBUG INIT_LOAD_LIBRARY JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION REMOVE MKDIR CP DATE FIND ZIP FASTJAR INSTALL_GLIBJ_ZIP_TRUE INSTALL_GLIBJ_ZIP_FALSE INSTALL_CLASS_FILES_TRUE INSTALL_CLASS_FILES_FALSE BUILD_CLASS_FILES_TRUE BUILD_CLASS_FILES_FALSE EXAMPLESDIR GJDOC CREATE_API_DOCS_TRUE CREATE_API_DOCS_FALSE JAY JAY_SKELETON REGEN_PARSERS_TRUE REGEN_PARSERS_FALSE USE_PREBUILT_GLIBJ_ZIP_TRUE USE_PREBUILT_GLIBJ_ZIP_FALSE PATH_TO_GLIBJ_ZIP USE_ESCHER_TRUE USE_ESCHER_FALSE PATH_TO_ESCHER ENABLE_LOCAL_SOCKETS_TRUE ENABLE_LOCAL_SOCKETS_FALSE DEFAULT_PREFS_PEER LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE LIBVERSION CLASSPATH_MODULE CLASSPATH_CONVENIENCE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CREATE_COLLECTIONS_TRUE CREATE_COLLECTIONS_FALSE CREATE_JNI_LIBRARIES_TRUE CREATE_JNI_LIBRARIES_FALSE CREATE_CORE_JNI_LIBRARIES_TRUE CREATE_CORE_JNI_LIBRARIES_FALSE CREATE_GCONF_PEER_LIBRARIES_TRUE CREATE_GCONF_PEER_LIBRARIES_FALSE default_toolkit CREATE_XMLJ_LIBRARY_TRUE CREATE_XMLJ_LIBRARY_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP CREATE_ALSA_LIBRARIES_TRUE CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE CREATE_GTK_PEER_LIBRARIES_FALSE CREATE_QT_PEER_LIBRARIES_TRUE CREATE_QT_PEER_LIBRARIES_FALSE CREATE_PLUGIN_TRUE CREATE_PLUGIN_FALSE toolexeclibdir nativeexeclibdir glibjdir VM_BINARY FOUND_CACAO_TRUE FOUND_CACAO_FALSE CREATE_JNI_HEADERS_TRUE CREATE_JNI_HEADERS_FALSE CREATE_WRAPPERS_TRUE CREATE_WRAPPERS_FALSE LN_S RANLIB ac_ct_RANLIB LIBTOOL CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP PERL COLLECTIONS_PREFIX LIBMAGIC LIBICONV LTLIBICONV WARNING_CFLAGS STRICT_WARNING_CFLAGS ERROR_CFLAGS PKG_CONFIG XML_CFLAGS XML_LIBS XSLT_CFLAGS XSLT_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CFLAGS GTK_LIBS FREETYPE2_CFLAGS FREETYPE2_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS XTEST_LIBS GCONF_CFLAGS GCONF_LIBS GDK_CFLAGS GDK_LIBS QT_CFLAGS QT_LIBS MOC MOZILLA_CFLAGS MOZILLA_LIBS GLIB_CFLAGS GLIB_LIBS PLUGIN_DIR USER_JAVAH USER_SPECIFIED_JAVAH_TRUE USER_SPECIFIED_JAVAH_FALSE CLASSPATH_INCLUDES GCJ JIKES JIKESENCODING JIKESWARNINGS KJC GCJX ECJ FOUND_GCJ_TRUE FOUND_GCJ_FALSE FOUND_JIKES_TRUE FOUND_JIKES_FALSE FOUND_ECJ_TRUE FOUND_ECJ_FALSE FOUND_KJC_TRUE FOUND_KJC_FALSE FOUND_GCJX_TRUE FOUND_GCJX_FALSE USER_CLASSLIB USER_SPECIFIED_CLASSLIB_TRUE USER_SPECIFIED_CLASSLIB_FALSE vm_classes MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBDEBUG INIT_LOAD_LIBRARY JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION REMOVE MKDIR CP DATE FIND ZIP FASTJAR INSTALL_GLIBJ_ZIP_TRUE INSTALL_GLIBJ_ZIP_FALSE INSTALL_CLASS_FILES_TRUE INSTALL_CLASS_FILES_FALSE BUILD_CLASS_FILES_TRUE BUILD_CLASS_FILES_FALSE EXAMPLESDIR GJDOC CREATE_API_DOCS_TRUE CREATE_API_DOCS_FALSE JAY JAY_SKELETON REGEN_PARSERS_TRUE REGEN_PARSERS_FALSE USE_PREBUILT_GLIBJ_ZIP_TRUE USE_PREBUILT_GLIBJ_ZIP_FALSE PATH_TO_GLIBJ_ZIP USE_ESCHER_TRUE USE_ESCHER_FALSE PATH_TO_ESCHER ENABLE_LOCAL_SOCKETS_TRUE ENABLE_LOCAL_SOCKETS_FALSE DEFAULT_PREFS_PEER LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -4341,6 +4341,15 @@
+ multi_os_directory=`$CC -print-multi-os-directory`
+ case $multi_os_directory in
+ .) toolexeclibdir=${libdir} ;; # Avoid trailing /.
+ *) toolexeclibdir=${libdir}/${multi_os_directory} ;;
+ esac
+
+
+
+
# Check whether --with-native-libdir or --without-native-libdir was given.
if test "${with_native_libdir+set}" = set; then
withval="$with_native_libdir"
@@ -4349,7 +4358,7 @@
else
- nativeexeclibdir='${libdir}/${PACKAGE}'
+ nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`
fi;
@@ -5555,7 +5564,7 @@
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5558 "configure"' > conftest.$ac_ext
+ echo '#line 5567 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -20809,6 +20818,7 @@
s,@CREATE_QT_PEER_LIBRARIES_FALSE@,$CREATE_QT_PEER_LIBRARIES_FALSE,;t t
s,@CREATE_PLUGIN_TRUE@,$CREATE_PLUGIN_TRUE,;t t
s,@CREATE_PLUGIN_FALSE@,$CREATE_PLUGIN_FALSE,;t t
+s,@toolexeclibdir@,$toolexeclibdir,;t t
s,@nativeexeclibdir@,$nativeexeclibdir,;t t
s,@glibjdir@,$glibjdir,;t t
s,@VM_BINARY@,$VM_BINARY,;t t
Index: Makefile.in
===================================================================
--- Makefile.in (revision 120647)
+++ Makefile.in (working copy)
@@ -41,9 +41,10 @@
$(top_srcdir)/gnu/classpath/Configuration.java.in \
$(top_srcdir)/gnu/java/security/Configuration.java.in \
$(top_srcdir)/resource/META-INF/services/java.util.prefs.PreferencesFactory.in \
- AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \
- config.sub depcomp install-sh ltcf-c.sh ltcf-cxx.sh \
- ltcf-gcj.sh ltconfig ltmain.sh missing mkinstalldirs
+ AUTHORS COPYING ChangeLog INSTALL NEWS TODO compile \
+ config.guess config.sub depcomp install-sh ltcf-c.sh \
+ ltcf-cxx.sh ltcf-gcj.sh ltconfig ltmain.sh missing \
+ mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
@@ -311,6 +312,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
# lib first, to compile .class files before native code, last examples
Index: native/jni/classpath/Makefile.in
===================================================================
--- native/jni/classpath/Makefile.in (revision 120647)
+++ native/jni/classpath/Makefile.in (working copy)
@@ -300,6 +300,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
# Header needed for jawt implementations such as the one found in ../gtk-peer.
Index: native/jni/midi-dssi/Makefile.in
===================================================================
--- native/jni/midi-dssi/Makefile.in (revision 120647)
+++ native/jni/midi-dssi/Makefile.in (working copy)
@@ -311,6 +311,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libgjsmdssi.la
libgjsmdssi_la_SOURCES = gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.c \
Index: native/jni/Makefile.in
===================================================================
--- native/jni/Makefile.in (revision 120647)
+++ native/jni/Makefile.in (working copy)
@@ -290,6 +290,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
@CREATE_CORE_JNI_LIBRARIES_TRUE@JNIDIRS = native-lib java-io java-lang java-net java-nio java-util
@CREATE_ALSA_LIBRARIES_TRUE@ALSADIR = midi-alsa
Index: native/jni/gconf-peer/Makefile.in
===================================================================
--- native/jni/gconf-peer/Makefile.in (revision 120647)
+++ native/jni/gconf-peer/Makefile.in (working copy)
@@ -310,6 +310,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libgconfpeer.la
libgconfpeer_la_SOURCES = GConfNativePeer.c
Index: native/jni/java-io/Makefile.in
===================================================================
--- native/jni/java-io/Makefile.in (revision 120647)
+++ native/jni/java-io/Makefile.in (working copy)
@@ -311,6 +311,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libjavaio.la
libjavaio_la_SOURCES = java_io_VMFile.c \
Index: native/jni/native-lib/Makefile.in
===================================================================
--- native/jni/native-lib/Makefile.in (revision 120647)
+++ native/jni/native-lib/Makefile.in (working copy)
@@ -300,6 +300,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
noinst_LTLIBRARIES = libclasspathnative.la
libclasspathnative_la_SOURCES = cpnet.c \
Index: native/jni/java-util/Makefile.in
===================================================================
--- native/jni/java-util/Makefile.in (revision 120647)
+++ native/jni/java-util/Makefile.in (working copy)
@@ -308,6 +308,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libjavautil.la
libjavautil_la_SOURCES = java_util_VMTimeZone.c
Index: native/jni/java-lang/Makefile.in
===================================================================
--- native/jni/java-lang/Makefile.in (revision 120647)
+++ native/jni/java-lang/Makefile.in (working copy)
@@ -317,6 +317,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libjavalang.la libjavalangreflect.la
libjavalang_la_SOURCES = java_lang_VMSystem.c \
Index: native/jni/midi-alsa/Makefile.in
===================================================================
--- native/jni/midi-alsa/Makefile.in (revision 120647)
+++ native/jni/midi-alsa/Makefile.in (working copy)
@@ -311,6 +311,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libgjsmalsa.la
libgjsmalsa_la_SOURCES = gnu_javax_sound_midi_alsa_AlsaMidiSequencerDevice.c \
Index: native/jni/java-nio/Makefile.in
===================================================================
--- native/jni/java-nio/Makefile.in (revision 120647)
+++ native/jni/java-nio/Makefile.in (working copy)
@@ -319,6 +319,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libjavanio.la
libjavanio_la_SOURCES = gnu_java_nio_VMPipe.c \
Index: native/jni/java-net/Makefile.in
===================================================================
--- native/jni/java-net/Makefile.in (revision 120647)
+++ native/jni/java-net/Makefile.in (working copy)
@@ -321,6 +321,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libjavanet.la
@ENABLE_LOCAL_SOCKETS_FALSE@local_sources = gnu_java_net_local_LocalSocketImpl.c
Index: native/jni/xmlj/Makefile.in
===================================================================
--- native/jni/xmlj/Makefile.in (revision 120647)
+++ native/jni/xmlj/Makefile.in (working copy)
@@ -310,6 +310,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libxmlj.la
libxmlj_la_SOURCES = \
Index: native/jni/qt-peer/Makefile.in
===================================================================
--- native/jni/qt-peer/Makefile.in (revision 120647)
+++ native/jni/qt-peer/Makefile.in (working copy)
@@ -326,6 +326,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
noinst_LTLIBRARIES = libqtpeer.la
AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
Index: native/jni/gtk-peer/Makefile.in
===================================================================
--- native/jni/gtk-peer/Makefile.in (revision 120647)
+++ native/jni/gtk-peer/Makefile.in (working copy)
@@ -349,6 +349,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
gcjversionedlibdir = $(libdir)/gcj-$(gcc_version)
@@ -403,12 +404,10 @@
gtk_jawt.c \
gtkpeer.h
-libgtkpeer_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
- -version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
-
libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
$(top_builddir)/native/jni/classpath/jcl.lo
+libgtkpeer_la_LDFLAGS = -avoid-version
AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @FREETYPE2_LIBS@ \
@PANGOFT2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ @XTEST_LIBS@
Index: native/jni/gtk-peer/Makefile.am
===================================================================
--- native/jni/gtk-peer/Makefile.am (revision 120647)
+++ native/jni/gtk-peer/Makefile.am (working copy)
@@ -53,13 +53,9 @@
gtk_jawt.c \
gtkpeer.h
-## GCJ LOCAL: encode the library path and use GCJ's library version
-libgtkpeer_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
- -version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
-
libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
$(top_builddir)/native/jni/classpath/jcl.lo
-## libgtkpeer_la_LDFLAGS = -avoid-version
+libgtkpeer_la_LDFLAGS = -avoid-version
AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @FREETYPE2_LIBS@ \
@PANGOFT2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ @XTEST_LIBS@
Index: native/Makefile.in
===================================================================
--- native/Makefile.in (revision 120647)
+++ native/Makefile.in (working copy)
@@ -290,6 +290,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
@CREATE_JNI_LIBRARIES_TRUE@JNIDIR = jni
@CREATE_GTK_PEER_LIBRARIES_TRUE@JAWTDIR = jawt
Index: native/jawt/Makefile.in
===================================================================
--- native/jawt/Makefile.in (revision 120647)
+++ native/jawt/Makefile.in (working copy)
@@ -309,15 +309,14 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
gcjversionedlibdir = $(libdir)/gcj-$(gcc_version)
gcjversionedlib_LTLIBRARIES = libjawt.la
libjawt_la_SOURCES = jawt.c
libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
-libjawt_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
- -version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
-
+libjawt_la_LDFLAGS = -avoid-version
AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@
AM_CPPFLAGS = @CLASSPATH_INCLUDES@
Index: native/jawt/Makefile.am
===================================================================
--- native/jawt/Makefile.am (revision 120647)
+++ native/jawt/Makefile.am (working copy)
@@ -6,13 +6,8 @@
libjawt_la_SOURCES = jawt.c
libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
-## FIXME?
-## libjawt_la_LDFLAGS = -avoid-version
+libjawt_la_LDFLAGS = -avoid-version
-## GCJ LOCAL: encode the library path and use GCJ's library version
-libjawt_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
- -version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
-
AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@
AM_CPPFLAGS = @CLASSPATH_INCLUDES@
Index: native/fdlibm/Makefile.in
===================================================================
--- native/fdlibm/Makefile.in (revision 120647)
+++ native/fdlibm/Makefile.in (working copy)
@@ -309,6 +309,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
noinst_LTLIBRARIES = libfdlibm.la
libfdlibm_la_SOURCES = \
Index: native/plugin/Makefile.in
===================================================================
--- native/plugin/Makefile.in (revision 120647)
+++ native/plugin/Makefile.in (working copy)
@@ -308,6 +308,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
nativeexeclib_LTLIBRARIES = libgcjwebplugin.la
libgcjwebplugin_la_SOURCES = gcjwebplugin.cc
Index: resource/Makefile.in
===================================================================
--- resource/Makefile.in (revision 120647)
+++ resource/Makefile.in (working copy)
@@ -293,11 +293,12 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
logging_DATA = java/util/logging/logging.properties
-loggingdir = $(prefix)/lib
+loggingdir = $(toolexeclibdir)
security_DATA = java/security/classpath.security
-securitydir = $(prefix)/lib/security
+securitydir = $(toolexeclibdir)/security
all: all-am
.SUFFIXES:
Index: resource/Makefile.am
===================================================================
--- resource/Makefile.am (revision 120647)
+++ resource/Makefile.am (working copy)
@@ -1,7 +1,7 @@
## used by automake to generate Makefile.in
logging_DATA = java/util/logging/logging.properties
-loggingdir = $(prefix)/lib
+loggingdir = $(toolexeclibdir)
security_DATA = java/security/classpath.security
-securitydir = $(prefix)/lib/security
+securitydir = $(toolexeclibdir)/security
Index: scripts/Makefile.in
===================================================================
--- scripts/Makefile.in (revision 120647)
+++ scripts/Makefile.in (working copy)
@@ -283,6 +283,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
EXTRA_DIST = check_jni_methods.sh generate-locale-list.sh import-cacerts.sh
all: all-am
Index: tools/Makefile.in
===================================================================
--- tools/Makefile.in (revision 120647)
+++ tools/Makefile.in (working copy)
@@ -393,6 +393,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
GLIBJ_BOOTCLASSPATH = '$(top_srcdir)/lib'
GLIBJ_CLASSPATH = $(srcdir)/asm
Index: configure.ac
===================================================================
--- configure.ac (revision 120647)
+++ configure.ac (working copy)
@@ -236,15 +236,24 @@
AM_CONDITIONAL(CREATE_PLUGIN, test "x${COMPILE_PLUGIN}" = xyes)
dnl -----------------------------------------------------------
+dnl GCJ LOCAL: Calculates and substitutes toolexeclibdir. $libdir is
+dnl defined to the same value for all multilibs. We define toolexeclibdir
+dnl so that we can refer to the multilib installation directories from
+dnl classpath's build files.
+dnl -----------------------------------------------------------
+CLASSPATH_TOOLEXECLIBDIR
+
+dnl -----------------------------------------------------------
dnl Sets the native libraries installation dir
dnl -----------------------------------------------------------
+dnl GCJ LOCAL: default to ${toolexeclibdir}/gcj-${gcc_version}
AC_ARG_WITH([native-libdir],
[AS_HELP_STRING(--with-native-libdir,sets the installation directory for native libraries [default='${libdir}/${PACKAGE}'])],
[
nativeexeclibdir=${withval}
],
[
- nativeexeclibdir='${libdir}/${PACKAGE}'
+ nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`
])
AC_SUBST(nativeexeclibdir)
Index: doc/Makefile.in
===================================================================
--- doc/Makefile.in (revision 120647)
+++ doc/Makefile.in (working copy)
@@ -291,6 +291,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
SUBDIRS = api
EXTRA_DIST = README.jaxp
Index: doc/api/Makefile.in
===================================================================
--- doc/api/Makefile.in (revision 120647)
+++ doc/api/Makefile.in (working copy)
@@ -284,6 +284,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
@CREATE_API_DOCS_TRUE@noinst_DATA = html
sourcepath = $(top_builddir):$(top_srcdir):$(top_srcdir)/vm/reference:$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax
Index: lib/Makefile.in
===================================================================
--- lib/Makefile.in (revision 120647)
+++ lib/Makefile.in (working copy)
@@ -287,6 +287,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
JAVA_DEPEND = java.dep
propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax org -name \*\.properties -print)
Index: external/Makefile.in
===================================================================
--- external/Makefile.in (revision 120647)
+++ external/Makefile.in (working copy)
@@ -291,6 +291,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
SUBDIRS = sax w3c_dom relaxngDatatype jsr166
EXTRA_DIST = README
Index: external/sax/Makefile.in
===================================================================
--- external/sax/Makefile.in (revision 120647)
+++ external/sax/Makefile.in (working copy)
@@ -282,6 +282,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
EXTRA_DIST = README \
org/xml/sax/ext/Attributes2.java \
Index: external/w3c_dom/Makefile.in
===================================================================
--- external/w3c_dom/Makefile.in (revision 120647)
+++ external/w3c_dom/Makefile.in (working copy)
@@ -282,6 +282,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
EXTRA_DIST = README \
org/w3c/dom/Attr.java \
Index: external/jsr166/Makefile.in
===================================================================
--- external/jsr166/Makefile.in (revision 120647)
+++ external/jsr166/Makefile.in (working copy)
@@ -282,6 +282,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
EXTRA_DIST = IMPORTING \
readme \
Index: external/relaxngDatatype/Makefile.in
===================================================================
--- external/relaxngDatatype/Makefile.in (revision 120647)
+++ external/relaxngDatatype/Makefile.in (working copy)
@@ -282,6 +282,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
EXTRA_DIST = README.txt \
copying.txt \
Index: include/Makefile.in
===================================================================
--- include/Makefile.in (revision 120647)
+++ include/Makefile.in (working copy)
@@ -283,6 +283,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
DISTCLEANFILES = jni_md.h config-int.h
ARG_JNI_JAVAH = -jni
Index: examples/Makefile.in
===================================================================
--- examples/Makefile.in (revision 120647)
+++ examples/Makefile.in (working copy)
@@ -293,6 +293,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
GLIBJ_CLASSPATH = '$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip':'$(top_builddir)/tools/tools.zip'
@FOUND_ECJ_TRUE@@FOUND_GCJX_FALSE@JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath .