procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

configure.in: Support --enable-version-specific-runtime-libs.

Browse source 
* configure.in: Support --enable-version-specific-runtime-libs.
	* configure: Regenerated.

From-SVN: r83125
This commit is contained in:
Andreas Jaeger 2004-06-14 20:29:01 +02:00 • committed by Andreas Jaeger
parent 2373de3a83
commit f1c3e0a60c
3 changed files with 441 additions and 372 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libjava/ChangeLog
View file

@ -1,3 +1,8 @@
2004-06-14 Andreas Jaeger <aj@suse.de>
* configure.in: Support --enable-version-specific-runtime-libs.
* configure: Regenerated.
2004-06-14 Bryce McKinlay <mckinlay@redhat.com>
* java/util/Calendar.java: Change ResourceBundle.getBundle() calls

755
libjava/configure vendored
View file

File diff suppressed because it is too large Load diff

53
libjava/configure.in
View file

@ -20,6 +20,19 @@ AC_ARG_WITH(cross-host,
AC_ARG_WITH(newlib,
[ --with-newlib Configuring with newlib])
AC_ARG_ENABLE(version-specific-runtime-libs,
[ --enable-version-specific-runtime-libs
specify that runtime libraries should be installed in a compiler-specific
directory ],
[case "$enableval" in
yes) version_specific_libs=yes ;;
no) version_specific_libs=no ;;
*) AC_MSG_ERROR([Unknown argument to enable/disable version-specific libs]);;
esac],
[version_specific_libs=no]
)
LIBGCJ_CONFIGURE(.)
AM_CONFIG_HEADER(include/config.h gcj/libgcj-config.h)
@ -1024,18 +1037,34 @@ AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes || test "$NULL_TARGET" = yes)
AM_CONDITIONAL(NEEDS_DATA_START, test "$NEEDS_DATA_START" = yes && test "$NATIVE" = yes)
AC_SUBST(GCC_UNWIND_INCLUDE)
if test -n "$with_cross_host" &&
test x"$with_cross_host" != x"no"; then
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexecmainlibdir='$(toolexecdir)/lib'
else
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
toolexecmainlibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
case $multi_os_directory in
.) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /.
*) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;;
# Process the option "--enable-version-specific-runtime-libs"
# Calculate toolexeclibdir
case ${version_specific_libs} in
yes)
# Need the gcc compiler version to know where to install libraries
# and header files if --enable-version-specific-runtime-libs option
# is selected.
includedir='${libdir}/gcc/${target_alias}/'$gcc_version/include/
toolexecdir='$(libdir)/gcc/$(target_alias)'
toolexecmainlibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
toolexeclibdir=$toolexecmainlibdir
;;
no)
if test -n "$with_cross_host" &&
test x"$with_cross_host" != x"no"; then
# Install a library built with a cross compiler in tooldir, not libdir.
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexecmainlibdir='$(toolexecdir)/lib'
else
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
toolexecmainlibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
case $multi_os_directory in
.) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /.
*) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;;
esac
;;
esac
AC_SUBST(toolexecdir)
AC_SUBST(toolexecmainlibdir)