From ed339fbc91b09accb8978b26990300c51a5b52bc Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 28 Jul 2007 20:32:27 +0000 Subject: configure.ac: Encode the libgcj soversion in dbexecdir... 2007-07-28 Matthias Klose * configure.ac: Encode the libgcj soversion in dbexecdir, pass --with-native-libdir to classpath configure. * configure: Regenerate. From-SVN: r127025 --- libjava/configure.ac | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'libjava/configure.ac') diff --git a/libjava/configure.ac b/libjava/configure.ac index ddda4e8911a..1a9452d7018 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1367,24 +1367,26 @@ AC_SUBST(toolexecdir) AC_SUBST(toolexecmainlibdir) AC_SUBST(toolexeclibdir) +# Determine gcj and libgcj version number. +gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([[^ ]]*\).*$/\1/p'` +libgcj_soversion=`awk -F: '/^[[^#]].*:/ { print $1 }' $srcdir/libtool-version` +GCJVERSION=$gcjversion +AC_SUBST(GCJVERSION) +AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERSION", [Short GCJ version ID]) + # 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)/gcj-$(gcc_version)'-$libgcj_soversion # Avoid /. ;; *) - dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' + dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)'-$libgcj_soversion ;; esac AC_SUBST(dbexecdir) - -# Determine gcj version number. -gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([[^ ]]*\).*$/\1/p'` -GCJVERSION=$gcjversion -AC_SUBST(GCJVERSION) -AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERSION", [Short GCJ version ID]) +ac_configure_args="$ac_configure_args --with-native-libdir=\$\(toolexeclibdir\)/gcj-$gcjversion-$libgcj_soversion" AC_DEFINE(JV_VERSION, "1.5.0", [Compatibility version string]) AC_DEFINE(JV_API_VERSION, "1.5", [API compatibility version string]) -- cgit v1.2.1