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

diff --git a/m4/multiarch.m4 b/m4/multiarch.m4
index fa03ceef7..691d89270 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 6
+dnl Copyright (C) 2008-2011 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.
@@ -16,10 +16,9 @@ dnl with or without modifications, as long as this notice is preserved.
 #                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
 #                 CPP="gcc -E" CXXCPP="g++ -E"
 #
-# Detect this situation and set the macro AA_APPLE_UNIVERSAL_BUILD at the
-# beginning of config.h and set APPLE_UNIVERSAL_BUILD accordingly.
+# Detect this situation 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 +37,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
@@ -55,8 +54,6 @@ AC_DEFUN([gl_MULTIARCH],
      done
     ])
   if test $gl_cv_c_multiarch = yes; then
-    AC_DEFINE([AA_APPLE_UNIVERSAL_BUILD], [1],
-      [Define if the compiler is building for multiple architectures of Apple platforms at once.])
     APPLE_UNIVERSAL_BUILD=1
   else
     APPLE_UNIVERSAL_BUILD=0