Fix configure logic for disabling multi-arch.

diff --git a/ChangeLog b/ChangeLog
index 035c25ecbf3ee0252814e81e92e8c890015db78c..27a63376adb96d8f8ffec71f65b589567efc2ae5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-24  Joseph Myers  <joseph@codesourcery.com>
+
+       * configure.in: Use -o not -a in test for unsupported multi-arch.
+       * configure: Regenerated.
+
 2012-02-24  Joseph Myers  <joseph@codesourcery.com>
 
        * manual/texinfo.tex: Update to version 2012-01-19.16.

diff --git a/configure b/configure
index ea02e72872d4f5cd6b963f6b272dc0e360fd8215..c07f60e51392d01a2e353078fcbb99565fd63684 100755 (executable)
--- a/configure
+++ b/configure
@@ -4142,7 +4142,7 @@ _ACEOF
 
 fi
 
-if test x"$libc_cv_asm_gnu_indirect_function" != xyes -a x"$libc_cv_asm_type_prefix" = xno; then
+if test x"$libc_cv_asm_gnu_indirect_function" != xyes -o x"$libc_cv_asm_type_prefix" = xno; then
   if test x"$multi_arch" = xyes; then
     as_fn_error $? "--enable-multi-arch support requires assembler and linker support" "$LINENO" 5
   else

diff --git a/configure.in b/configure.in
index af42c8ad2f76e824a92c5f51eaf4f96a425d9f0a..335c796c2be34ace239e6b7e7332428a04f119bf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -598,7 +598,7 @@ if test "x$libc_cv_asm_type_prefix" != xno; then
   AC_DEFINE_UNQUOTED(ASM_TYPE_DIRECTIVE_PREFIX, ${libc_cv_asm_type_prefix})
 fi
 
-if test x"$libc_cv_asm_gnu_indirect_function" != xyes -a x"$libc_cv_asm_type_prefix" = xno; then
+if test x"$libc_cv_asm_gnu_indirect_function" != xyes -o x"$libc_cv_asm_type_prefix" = xno; then
   if test x"$multi_arch" = xyes; then
     AC_MSG_ERROR([--enable-multi-arch support requires assembler and linker support])
   else