Commit 50e47dba by Matthias Klose Committed by Matthias Klose

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
parent ac545c64
2007-09-04 Matthias Klose <doko@ubuntu.com> 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 PR libgcj/33278
* configure.ac: Robustify extraction of gcj version. * configure.ac: Robustify extraction of gcj version.
* configure: Regenerate. * configure: Regenerate.
......
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> 2007-08-04 Matthias Klose <doko@ubuntu.com>
* java/util/EnumMap.java (clone): Add cast. * java/util/EnumMap.java (clone): Add cast.
......
...@@ -4771,7 +4771,7 @@ if test "${with_native_libdir+set}" = set; then ...@@ -4771,7 +4771,7 @@ if test "${with_native_libdir+set}" = set; then
else 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; fi;
......
...@@ -294,14 +294,14 @@ CLASSPATH_TOOLEXECLIBDIR ...@@ -294,14 +294,14 @@ CLASSPATH_TOOLEXECLIBDIR
dnl ----------------------------------------------------------- dnl -----------------------------------------------------------
dnl Sets the native libraries installation dir dnl Sets the native libraries installation dir
dnl ----------------------------------------------------------- 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], AC_ARG_WITH([native-libdir],
[AS_HELP_STRING(--with-native-libdir,sets the installation directory for native libraries [default='${libdir}/${PACKAGE}'])], [AS_HELP_STRING(--with-native-libdir,sets the installation directory for native libraries [default='${libdir}/${PACKAGE}'])],
[ [
nativeexeclibdir=${withval} 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) AC_SUBST(nativeexeclibdir)
......
...@@ -26200,17 +26200,17 @@ _ACEOF ...@@ -26200,17 +26200,17 @@ _ACEOF
# Determine where the standard .db file and GNU Classpath JNI # Determine where the standard .db file and GNU Classpath JNI
# libraries are found. # libraries are found.
gcjsubdir=gcj-$gcjversion-$libgcj_soversion
multi_os_directory=`$CC -print-multi-os-directory` multi_os_directory=`$CC -print-multi-os-directory`
case $multi_os_directory in 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 esac
ac_configure_args="$ac_configure_args --with-native-libdir=\$\(toolexeclibdir\)/gcj-$gcjversion-$libgcj_soversion"
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
......
...@@ -1389,17 +1389,17 @@ AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERSION", [Short GCJ version ID]) ...@@ -1389,17 +1389,17 @@ AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERSION", [Short GCJ version ID])
# Determine where the standard .db file and GNU Classpath JNI # Determine where the standard .db file and GNU Classpath JNI
# libraries are found. # libraries are found.
gcjsubdir=gcj-$gcjversion-$libgcj_soversion
multi_os_directory=`$CC -print-multi-os-directory` multi_os_directory=`$CC -print-multi-os-directory`
case $multi_os_directory in 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 esac
AC_SUBST(dbexecdir) 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_VERSION, "1.5.0", [Compatibility version string])
AC_DEFINE(JV_API_VERSION, "1.5", [API compatibility version string]) AC_DEFINE(JV_API_VERSION, "1.5", [API compatibility version string])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment