diff options
Diffstat (limited to 'libjava/configure.ac')
| -rw-r--r-- | libjava/configure.ac | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac index fab0264..44340a4 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1266,11 +1266,18 @@ AC_SUBST(toolexecdir) AC_SUBST(toolexecmainlibdir) AC_SUBST(toolexeclibdir) -# Determine where the standard .db file is found. +# Determine where the standard .db file and GNU Classpath JNI +# libraries are found. multi_os_directory=`$CC -print-multi-os-directory` case $multi_os_directory in - .) dbexecdir='$(libdir)/gcj-$(gcc_version)' ;; # Avoid /. - *) dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' ;; + .) + dbexecdir='$(libdir)/gcj-$(gcc_version)' # Avoid /. + ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/gcj-`cat $srcdir/../gcc/BASE-VER`" + ;; + *) + dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' + ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`" + ;; esac AC_SUBST(dbexecdir) |