diff options
| author | Phil Edwards <pme@gcc.gnu.org> | 2003-06-09 14:54:08 +0000 |
|---|---|---|
| committer | Phil Edwards <pme@gcc.gnu.org> | 2003-06-09 14:54:08 +0000 |
| commit | 16da539b7d34cc314c354b29527746b42051ae14 (patch) | |
| tree | b0528c1cf7bf63f9ca2c6098a52a345bf4217e73 /libstdc++-v3/configure.in | |
| parent | 36f04556d6bf6b8c272065bab473e354e8540ca9 (diff) | |
| download | gcc-16da539b7d34cc314c354b29527746b42051ae14.zip gcc-16da539b7d34cc314c354b29527746b42051ae14.tar.gz gcc-16da539b7d34cc314c354b29527746b42051ae14.tar.bz2 | |
acinclude.m4: Move all AM_CONDITIONAL calls out.
2003-06-09 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4: Move all AM_CONDITIONAL calls out.
(GLIBCPP_CONFIGURE): Set defaults for variables used in AM_CONDITIONAL
statements.
* configure.in: Centralize AM_CONDITIONALs so that they are always
run. Make use of GLIBCPP_IS_CROSS_COMPILING.
* aclocal.m4, configure: Regenerated.
From-SVN: r67663
Diffstat (limited to 'libstdc++-v3/configure.in')
| -rw-r--r-- | libstdc++-v3/configure.in | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in index b24181c..1165273 100644 --- a/libstdc++-v3/configure.in +++ b/libstdc++-v3/configure.in @@ -81,7 +81,7 @@ fi if test x"$build" != x"$host"; then # We are being configured with some form of cross compiler. - GLIBCPP_IS_CROSS_COMPILING=1 + GLIBCPP_IS_CROSS_COMPILING=true # This lets us hard-code the functionality we know we'll have in the cross # target environment. "Let" is a sugar-coated word placed on an especially @@ -401,7 +401,7 @@ else # We are being configured natively. We can do more elaborate tests # that include AC_TRY_COMPILE now, as the linker is assumed to be # working. - GLIBCPP_IS_CROSS_COMPILING=0 + GLIBCPP_IS_CROSS_COMPILING=false CANADIAN=no # Check for available headers. @@ -447,9 +447,17 @@ ATOMICITY_INC_SRCDIR=config/${ATOMICITYH} AC_SUBST(OS_INC_SRCDIR) AC_SUBST(ATOMICITY_INC_SRCDIR) -# Set up cross-compile flags -AC_SUBST(GLIBCPP_IS_CROSS_COMPILING) dnl Unused so far. +# Set up cross-compile flags and all AM_CONDITIONALs. +AC_SUBST(GLIBCPP_IS_CROSS_COMPILING) AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes) +dnl from GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT: +AM_CONDITIONAL(GLIBCPP_BUILD_LIBMATH, test "$need_libmath" = yes) +dnl from GLIBCPP_CHECK_WCHAR_T_SUPPORT: +AM_CONDITIONAL(GLIBCPP_TEST_WCHAR_T, test "$enable_wchar_t" = yes) +dnl from GLIBCPP_CONFIGURE_TESTSUITE: +# Don't do ABI checking unless native. +AM_CONDITIONAL(GLIBCPP_BUILD_ABI_CHECK, + ${GLIBCPP_IS_CROSS_COMPILING} && test "$enable_abi_check" = yes ) AC_CACHE_SAVE |