summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-01-19 16:20:30 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-01-19 16:21:00 -0800
commitc93f15eceb7bad3fd57d32ebf7f0676fb5fd3247 (patch)
treed334f1c2c03128a5bfb65820fd3e88dc9c5c0a16
parentf607ad3bb9988f9a7bf0b6d3f18f92bdee12724c (diff)
downloadgnulib-c93f15eceb7bad3fd57d32ebf7f0676fb5fd3247.tar.gz
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.
-rw-r--r--ChangeLog8
-rw-r--r--NEWS3
-rw-r--r--m4/multiarch.m47
3 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f01df0de79..41a445298f 100644
--- 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 49a44ec955..40fa082a06 100644
--- 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 47e3e63a3e..691d89270b 100644
--- 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