From: Joseph Myers <joseph@codesourcery.com>
Date: Sat, 25 Feb 2012 00:29:19 +0000 (+0000)
Subject: Fix configure logic for disabling multi-arch.
X-Git-Tag: glibc-2.16-tps~949
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b1d1d46b9344dab2fb36734c61dc9d517214a6d;p=thirdparty%2Fglibc.git

Fix configure logic for disabling multi-arch.
---

diff --git a/ChangeLog b/ChangeLog
index 035c25ecbf3..27a63376adb 100644
--- 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 ea02e72872d..c07f60e5139 100755
--- 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 af42c8ad2f7..335c796c2be 100644
--- 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