X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmultiarch.m4;h=389bd2bbaa6e73bbccc10e73f88c2ab079a24e0b;hb=aadf332a5c5f209affd38c35b4e9faaa8a0adecb;hp=fa03ceef74fe4416ef54b67dc3389be53aace32d;hpb=bf57161d3867968ecf2a4d666062c41d5a1fbddd;p=gnulib.git

diff --git a/m4/multiarch.m4 b/m4/multiarch.m4
index fa03ceef7..389bd2bba 100644
--- a/m4/multiarch.m4
+++ b/m4/multiarch.m4
@@ -1,5 +1,5 @@
-# multiarch.m4 serial 1
-dnl Copyright (C) 2008 Free Software Foundation, Inc.
+# multiarch.m4 serial 5
+dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -19,7 +19,7 @@ dnl with or without modifications, as long as this notice is preserved.
 # Detect this situation and set the macro AA_APPLE_UNIVERSAL_BUILD at the
 # beginning of config.h and set APPLE_UNIVERSAL_BUILD accordingly.
 
-AC_DEFUN([gl_MULTIARCH],
+AC_DEFUN_ONCE([gl_MULTIARCH],
 [
   dnl Code similar to autoconf-2.63 AC_C_BIGENDIAN.
   gl_cv_c_multiarch=no
@@ -38,7 +38,7 @@ AC_DEFUN([gl_MULTIARCH],
      for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
        if test -n "$prev"; then
          case $word in
-           i386 | x86_64 | ppc | ppc64)
+           i?86 | x86_64 | ppc | ppc64)
              if test -z "$arch" || test "$arch" = "$word"; then
                arch="$word"
              else