mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-27 03:03:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

configure.in: Move as much as possible below AC_CANONICAL_SYSTEM.

Browse Source 
* configure.in: Move as much as possible below AC_CANONICAL_SYSTEM.
	Introduce _GCC_TOPLEV_NONCANONICAL_TARGET.
	* acinclude.m4: Include acx.m4.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

From-SVN: r84797
This commit is contained in:
Nathanael Nerode 2004-07-16 02:11:33 +00:00
parent aaaa46d2b0
commit bc03b358a0
5 changed files with 495 additions and 465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libjava/ChangeLog
View File

@ -1,3 +1,11 @@
2004-07-15 Nathanael Nerode <neroden@gcc.gnu.org>
* configure.in: Move as much as possible below AC_CANONICAL_SYSTEM.
Introduce _GCC_TOPLEV_NONCANONICAL_TARGET.
* acinclude.m4: Include acx.m4.
* aclocal.m4: Regenerate.
* configure: Regenerate.
2004-07-15 Bryce McKinlay <mckinlay@redhat.com>
PR libgcj/16574

1
libjava/acinclude.m4
View File

@ -1,4 +1,5 @@
sinclude(../config/accross.m4)
sinclude(../config/acx.m4)
sinclude(../libtool.m4)
dnl The lines below arrange for aclocal not to bring libtool.m4

1
libjava/aclocal.m4 vendored
View File

@ -11,6 +11,7 @@ dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE.
sinclude(../config/accross.m4)
sinclude(../config/acx.m4)
sinclude(../libtool.m4)
dnl The lines below arrange for aclocal not to bring libtool.m4

877
libjava/configure vendored
View File

File diff suppressed because it is too large Load Diff

73
libjava/configure.in
View File

@ -2,44 +2,10 @@ dnl Process this with autoconf to create configure
AC_PREREQ(2.13)
AC_INIT(java/lang/System.java)
# This works around the fact that libtool configuration may change LD
# for this particular configuration, but some shells, instead of
# keeping the changes in LD private, export them just because LD is
# exported.
ORIGINAL_LD_FOR_MULTILIBS=$LD
AC_PROG_LN_S
dnl We use these options to decide which functions to include.
AC_ARG_WITH(target-subdir,
[ --with-target-subdir=SUBDIR
configuring in a subdirectory])
AC_ARG_WITH(cross-host,
[ --with-cross-host=HOST configuring with a cross compiler])
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]
)
dnl Default to --enable-multilib
AC_ARG_ENABLE(multilib,
[ --enable-multilib build many library versions (default)],
[case "${enableval}" in
yes) multilib=yes ;;
no) multilib=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
esac], [multilib=yes])dnl
dnl We may get other options which we don't document:
dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@ -73,11 +39,48 @@ if :; then :; else
AC_CONFIG_AUX_DIR(..)
fi
AC_CANONICAL_SYSTEM
_GCC_TOPLEV_NONCANONICAL_TARGET
# This works around the fact that libtool configuration may change LD
# for this particular configuration, but some shells, instead of
# keeping the changes in LD private, export them just because LD is
# exported.
ORIGINAL_LD_FOR_MULTILIBS=$LD
AC_PROG_LN_S
# This works around an automake problem.
mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
AC_SUBST(mkinstalldirs)
AC_CANONICAL_SYSTEM
AC_ARG_WITH(cross-host,
[ --with-cross-host=HOST configuring with a cross compiler])
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]
)
dnl Default to --enable-multilib
AC_ARG_ENABLE(multilib,
[ --enable-multilib build many library versions (default)],
[case "${enableval}" in
yes) multilib=yes ;;
no) multilib=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
esac], [multilib=yes])dnl
dnl This shouldn't be needed, as long as top-level dependencies are
dnl defined correctly and shared-library paths are set up so that