Commit bc03b358 by Nathanael Nerode

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

	* 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
parent aaaa46d2
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> 2004-07-15 Bryce McKinlay <mckinlay@redhat.com>
PR libgcj/16574 PR libgcj/16574
......
sinclude(../config/accross.m4) sinclude(../config/accross.m4)
sinclude(../config/acx.m4)
sinclude(../libtool.m4) sinclude(../libtool.m4)
dnl The lines below arrange for aclocal not to bring libtool.m4 dnl The lines below arrange for aclocal not to bring libtool.m4
......
...@@ -11,6 +11,7 @@ dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A ...@@ -11,6 +11,7 @@ dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE. dnl PARTICULAR PURPOSE.
sinclude(../config/accross.m4) sinclude(../config/accross.m4)
sinclude(../config/acx.m4)
sinclude(../libtool.m4) sinclude(../libtool.m4)
dnl The lines below arrange for aclocal not to bring libtool.m4 dnl The lines below arrange for aclocal not to bring libtool.m4
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -2,44 +2,10 @@ dnl Process this with autoconf to create configure ...@@ -2,44 +2,10 @@ dnl Process this with autoconf to create configure
AC_PREREQ(2.13) AC_PREREQ(2.13)
AC_INIT(java/lang/System.java) 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. dnl We use these options to decide which functions to include.
AC_ARG_WITH(target-subdir, AC_ARG_WITH(target-subdir,
[ --with-target-subdir=SUBDIR [ --with-target-subdir=SUBDIR
configuring in a subdirectory]) 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 We may get other options which we don't document:
dnl --with-target-subdir, --with-multisrctop, --with-multisubdir dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
...@@ -73,11 +39,48 @@ if :; then :; else ...@@ -73,11 +39,48 @@ if :; then :; else
AC_CONFIG_AUX_DIR(..) AC_CONFIG_AUX_DIR(..)
fi 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. # This works around an automake problem.
mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
AC_SUBST(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 This shouldn't be needed, as long as top-level dependencies are
dnl defined correctly and shared-library paths are set up so that dnl defined correctly and shared-library paths are set up so that
......
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