# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1295482830 28800
# Node ID 2be94b732a016739f50ba02b6b7e9c265589f7c8
# Parent  3cb76305b3e92652729ba4528ded77a40f40de57
multiarch: remove AA_APPLE_UNIVERSAL_BUILD

* m4/multiarch.m4 (gl_MULTIARCH): Don't AC_DEFINE
AA_APPLE_UNIVERSAL_BUILD.  See
<http://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00247.html>.
* NEWS: Document this.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	multiarch: remove AA_APPLE_UNIVERSAL_BUILD
+	* m4/multiarch.m4 (gl_MULTIARCH): Don't AC_DEFINE
+	AA_APPLE_UNIVERSAL_BUILD.  See
+	<http://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00247.html>.
+	* NEWS: Document this.
+
 2011-01-19  Eric Blake  <eblake@redhat.com>
 
 	c-stack: assume stack overflow if SA_SIGINFO unsupported
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,9 @@
 
 Date        Modules         Changes
 
+2011-01-18  multiarch       This no longer #defines AA_APPLE_UNIVERSAL_BUILD;
+                            instead, use the shell var APPLE_UNIVERSAL_BUILD.
+
 2010-12-10  pipe            This module is renamed to spawn-pipe. The include
                             file is renamed to "spawn-pipe.h".
 
diff --git a/m4/multiarch.m4 b/m4/multiarch.m4
--- a/m4/multiarch.m4
+++ b/m4/multiarch.m4
@@ -1,4 +1,4 @@
-# multiarch.m4 serial 5
+# 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,
@@ -16,8 +16,7 @@
 #                 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_ONCE([gl_MULTIARCH],
 [
@@ -55,8 +54,6 @@
      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