From 50e47dba16df43b6d45849e364cce6963950d3ce Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 5 Sep 2007 07:45:09 +0000 Subject: configure.ac: Do not pass --with-native-libdir to classpath. libjava/ 2007-09-04 Matthias Klose * configure.ac: Do not pass --with-native-libdir to classpath. * configure: Regenerate. libjava/classpath/ 2007-09-04 Matthias Klose * configure.ac: Append libgcj soversion to nativeexeclibdir. * configure: Regenerate. From-SVN: r128121 --- libjava/configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libjava/configure') diff --git a/libjava/configure b/libjava/configure index 89e5fff..f219205 100755 --- a/libjava/configure +++ b/libjava/configure @@ -26200,17 +26200,17 @@ _ACEOF # Determine where the standard .db file and GNU Classpath JNI # libraries are found. +gcjsubdir=gcj-$gcjversion-$libgcj_soversion multi_os_directory=`$CC -print-multi-os-directory` case $multi_os_directory in .) - dbexecdir='$(libdir)/gcj-$(gcc_version)'-$libgcj_soversion # Avoid /. + dbexecdir='$(libdir)/'$gcjsubdir # Avoid /. ;; *) - dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)'-$libgcj_soversion + dbexecdir='$(libdir)/'$multi_os_directory/$gcjsubdir ;; esac -ac_configure_args="$ac_configure_args --with-native-libdir=\$\(toolexeclibdir\)/gcj-$gcjversion-$libgcj_soversion" cat >>confdefs.h <<\_ACEOF -- cgit v1.1