Fix configure logic for disabling multi-arch.

diff --git a/ChangeLog b/ChangeLog
index 035c25e..27a6337 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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.
 
 2012-02-24  Joseph Myers  <joseph@codesourcery.com>

diff --git a/configure b/configure
index ea02e72..c07f60e 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 af42c8a..335c796 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