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
index f01df0de79d2d7f24b778693b36eb44f72d86860..41a445298fba213cd0fef55d3b1bd57bad8c2681 100644 (file)
--- 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
index 49a44ec9553d1d74ffa45711178d9b0e4e32fc26..40fa082a062a3b296a9744017c4d1deb032881cc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,9 @@ User visible incompatible changes
 
 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
index 47e3e63a3ed10a2322391d1b3bcfcf3462f05c0f..691d89270b69ea15a1e83a9584a959d008f386bc 100644 (file)
--- 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 @@ 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_ONCE([gl_MULTIARCH],
 [
@@ -55,8 +54,6 @@ AC_DEFUN_ONCE([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