From 50e47dba16df43b6d45849e364cce6963950d3ce Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Wed, 5 Sep 2007 07:45:09 +0000
Subject: [PATCH] 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
---
libjava/ChangeLog | 5 +++++
libjava/classpath/ChangeLog.gcj | 5 +++++
libjava/classpath/configure | 2 +-
libjava/classpath/configure.ac | 4 ++--
libjava/configure | 6 +++---
libjava/configure.ac | 6 +++---
6 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6846f9b2af7a..c0c18ea08141 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-04 Matthias Klose <doko@ubuntu.com>
+
+ * configure.ac: Do not pass --with-native-libdir to classpath.
+ * configure: Regenerate.
+
2007-09-04 Matthias Klose <doko@ubuntu.com>
PR libgcj/33278
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index ff019d023680..b5de4d8086e5 100644
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -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.
diff --git a/libjava/classpath/configure b/libjava/classpath/configure
index 3e8b19dda8d6..7d283ed19a38 100755
--- a/libjava/classpath/configure
+++ b/libjava/classpath/configure
@@ -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;
diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac
index b6feecf5b680..0a017d19e9d6 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)
diff --git a/libjava/configure b/libjava/configure
index 89e5fff58df2..f21920587818 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
diff --git a/libjava/configure.ac b/libjava/configure.ac
index e1fada2eddfd..c99a88278431 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1389,17 +1389,17 @@ AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERSION", [Short GCJ version ID])
# 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_SUBST(dbexecdir)
-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])
--
GitLab