aboutsummaryrefslogtreecommitdiff
path: root/libjava/classpath/configure.ac
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2007-09-05 07:45:09 +0000
committerMatthias Klose <doko@gcc.gnu.org>2007-09-05 07:45:09 +0000
commit50e47dba16df43b6d45849e364cce6963950d3ce (patch)
treecb612554356dc457d1941be80bdb32a9ef00649c /libjava/classpath/configure.ac
parentac545c6462ebcbb067b2895bee6a67a7eecca728 (diff)
downloadgcc-50e47dba16df43b6d45849e364cce6963950d3ce.zip
gcc-50e47dba16df43b6d45849e364cce6963950d3ce.tar.gz
gcc-50e47dba16df43b6d45849e364cce6963950d3ce.tar.bz2
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
Diffstat (limited to 'libjava/classpath/configure.ac')
-rw-r--r--libjava/classpath/configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac
index b6feecf..0a017d1 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)