diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-06-22 10:20:00 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-06-22 10:20:00 -0700 |
| commit | 057306483c1c7a9216276c51946406c422d60b70 (patch) | |
| tree | f1bf01008eeaf5b20ed7311e64a3fdec783c9bcf /m4/multiarch.m4 | |
| parent | b57b344b51c06239b4f3584f9ab946dd48c60bb2 (diff) | |
| download | emacs-057306483c1c7a9216276c51946406c422d60b70.tar.gz | |
Merge from gnulib.
* lib/filemode.h, lib/signal.in.h, lib/stat.c, lib/stdint.in.h:
* lib/stdlib.in.h, lib/unistd.in.h, m4/extensions.m4, m4/getloadavg.m4:
* m4/getopt.m4, m4/gnulib-common.m4, m4/largefile.m4, m4/mktime.m4:
* m4/multiarch.m4, m4/nocrash.m4, m4/stdio_h.m4, m4/time_r.m4:
Copy new versions from gnulib, incorporating the following changes:
2012-06-22 time_r: fix typo that always overrode localtime_r decl
2012-06-22 Write "Mac OS X" instead of "MacOS X".
2012-06-21 mktime: fix integer overflow in 'configure'-time test
2012-06-21 nonblocking: Avoid compilation error on mingw64.
2012-06-19 stat, fstat: Avoid warnings on mingw64.
2012-06-19 getopt-gnu: Fix exit code overflow in autoconf test.
Diffstat (limited to 'm4/multiarch.m4')
| -rw-r--r-- | m4/multiarch.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/m4/multiarch.m4 b/m4/multiarch.m4 index b424dce652b..0c288b8d2a9 100644 --- a/m4/multiarch.m4 +++ b/m4/multiarch.m4 @@ -1,4 +1,4 @@ -# multiarch.m4 serial 6 +# multiarch.m4 serial 7 dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. # Determine whether the compiler is or may be producing universal binaries. # -# On MacOS X 10.5 and later systems, the user can create libraries and +# On Mac OS X 10.5 and later systems, the user can create libraries and # executables that work on multiple system types--known as "fat" or # "universal" binaries--by specifying multiple '-arch' options to the # compiler but only a single '-arch' option to the preprocessor. Like |