diff options
| author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-09-05 07:45:09 +0000 |
|---|---|---|
| committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-09-05 07:45:09 +0000 |
| commit | a1b6c3e144fa8b777a63b1a58609495deafb518b (patch) | |
| tree | cb612554356dc457d1941be80bdb32a9ef00649c /libjava/classpath | |
| parent | b4b343354bbff95311148aa83c504ab250e31252 (diff) | |
| download | gcc-a1b6c3e144fa8b777a63b1a58609495deafb518b.tar.gz | |
libjava/
2007-09-04 Matthias Klose <doko@ubuntu.com>
* configure.ac: Do not pass --with-native-libdir to classpath.
* configure: Regenerate.
libjava/classpath/
2007-09-04 Matthias Klose <doko@ubuntu.com>
* configure.ac: Append libgcj soversion to nativeexeclibdir.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@128121 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath')
| -rw-r--r-- | libjava/classpath/ChangeLog.gcj | 5 | ||||
| -rwxr-xr-x | libjava/classpath/configure | 2 | ||||
| -rw-r--r-- | libjava/classpath/configure.ac | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index ff019d02368..b5de4d8086e 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,8 @@ +2007-09-04 Matthias Klose <doko@ubuntu.com> + + * configure.ac: Append libgcj soversion to nativeexeclibdir. + * configure: Regenerate. + 2007-08-04 Matthias Klose <doko@ubuntu.com> * java/util/EnumMap.java (clone): Add cast. diff --git a/libjava/classpath/configure b/libjava/classpath/configure index 3e8b19dda8d..7d283ed19a3 100755 --- a/libjava/classpath/configure +++ b/libjava/classpath/configure @@ -4771,7 +4771,7 @@ if test "${with_native_libdir+set}" = set; then else - nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER` + nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`-`awk -F: '/^[^#].*:/ { print $1 }' ${srcdir}/../libtool-version` fi; diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac index b6feecf5b68..0a017d19e9d 100644 --- a/libjava/classpath/configure.ac +++ b/libjava/classpath/configure.ac @@ -294,14 +294,14 @@ CLASSPATH_TOOLEXECLIBDIR dnl ----------------------------------------------------------- dnl Sets the native libraries installation dir dnl ----------------------------------------------------------- -dnl GCJ LOCAL: default to ${toolexeclibdir}/gcj-${gcc_version} +dnl GCJ LOCAL: default to ${toolexeclibdir}/gcj-${gcc_version}-${libgcj_soversion} AC_ARG_WITH([native-libdir], [AS_HELP_STRING(--with-native-libdir,sets the installation directory for native libraries [default='${libdir}/${PACKAGE}'])], [ nativeexeclibdir=${withval} ], [ - nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER` + nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`-`awk -F: '/^[[^#]].*:/ { print $1 }' ${srcdir}/../libtool-version` ]) AC_SUBST(nativeexeclibdir) |