diff options
Diffstat (limited to 'gl/m4/multiarch.m4')
-rw-r--r-- | gl/m4/multiarch.m4 | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gl/m4/multiarch.m4 b/gl/m4/multiarch.m4 index 389bd2bb..552ec7e7 100644 --- a/gl/m4/multiarch.m4 +++ b/gl/m4/multiarch.m4 | |||
@@ -1,12 +1,12 @@ | |||
1 | # multiarch.m4 serial 5 | 1 | # multiarch.m4 serial 7 |
2 | dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 2008-2013 Free Software Foundation, Inc. |
3 | dnl This file is free software; the Free Software Foundation | 3 | dnl This file is free software; the Free Software Foundation |
4 | dnl gives unlimited permission to copy and/or distribute it, | 4 | dnl gives unlimited permission to copy and/or distribute it, |
5 | dnl with or without modifications, as long as this notice is preserved. | 5 | dnl with or without modifications, as long as this notice is preserved. |
6 | 6 | ||
7 | # Determine whether the compiler is or may be producing universal binaries. | 7 | # Determine whether the compiler is or may be producing universal binaries. |
8 | # | 8 | # |
9 | # On MacOS X 10.5 and later systems, the user can create libraries and | 9 | # On Mac OS X 10.5 and later systems, the user can create libraries and |
10 | # executables that work on multiple system types--known as "fat" or | 10 | # executables that work on multiple system types--known as "fat" or |
11 | # "universal" binaries--by specifying multiple '-arch' options to the | 11 | # "universal" binaries--by specifying multiple '-arch' options to the |
12 | # compiler but only a single '-arch' option to the preprocessor. Like | 12 | # compiler but only a single '-arch' option to the preprocessor. Like |
@@ -16,8 +16,7 @@ dnl with or without modifications, as long as this notice is preserved. | |||
16 | # CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ | 16 | # CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ |
17 | # CPP="gcc -E" CXXCPP="g++ -E" | 17 | # CPP="gcc -E" CXXCPP="g++ -E" |
18 | # | 18 | # |
19 | # Detect this situation and set the macro AA_APPLE_UNIVERSAL_BUILD at the | 19 | # Detect this situation and set APPLE_UNIVERSAL_BUILD accordingly. |
20 | # beginning of config.h and set APPLE_UNIVERSAL_BUILD accordingly. | ||
21 | 20 | ||
22 | AC_DEFUN_ONCE([gl_MULTIARCH], | 21 | AC_DEFUN_ONCE([gl_MULTIARCH], |
23 | [ | 22 | [ |
@@ -55,8 +54,6 @@ AC_DEFUN_ONCE([gl_MULTIARCH], | |||
55 | done | 54 | done |
56 | ]) | 55 | ]) |
57 | if test $gl_cv_c_multiarch = yes; then | 56 | if test $gl_cv_c_multiarch = yes; then |
58 | AC_DEFINE([AA_APPLE_UNIVERSAL_BUILD], [1], | ||
59 | [Define if the compiler is building for multiple architectures of Apple platforms at once.]) | ||
60 | APPLE_UNIVERSAL_BUILD=1 | 57 | APPLE_UNIVERSAL_BUILD=1 |
61 | else | 58 | else |
62 | APPLE_UNIVERSAL_BUILD=0 | 59 | APPLE_UNIVERSAL_BUILD=0 |