diff options
| author | Matthias Klose <doko@debian.org> | 2007-01-11 00:01:27 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2007-01-11 00:01:27 +0000 |
| commit | eee96b1bb085e08d7a6eb415bb42e61122914268 (patch) | |
| tree | bba088e4c29a9d74e18cea4ade44c4b77af3364c /libjava/classpath/configure.ac | |
| parent | 10f1f9f70c999078ab206bcc709ec6e0a5731f89 (diff) | |
| download | gcc-eee96b1bb085e08d7a6eb415bb42e61122914268.zip gcc-eee96b1bb085e08d7a6eb415bb42e61122914268.tar.gz gcc-eee96b1bb085e08d7a6eb415bb42e61122914268.tar.bz2 | |
Readd missing chunks from r116332:
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
From-SVN: r120654
Diffstat (limited to 'libjava/classpath/configure.ac')
| -rw-r--r-- | libjava/classpath/configure.ac | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac index 83bab19..9704f94 100644 --- a/libjava/classpath/configure.ac +++ b/libjava/classpath/configure.ac @@ -236,15 +236,24 @@ AC_ARG_ENABLE([plugin], 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) |