configure.ac: Do not pass --with-native-libdir to classpath.
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. From-SVN: r128121
This commit is contained in:
parent
ac545c6462
commit
50e47dba16
6 changed files with 19 additions and 9 deletions
|
@ -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.
|
||||
|
|
2
libjava/classpath/configure
vendored
2
libjava/classpath/configure
vendored
|
@ -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;
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue