diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-12-23 22:24:08 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-12-23 22:24:08 -0800 |
| commit | 219023c4347abfc9461f2d99245de3c4aa7f1e64 (patch) | |
| tree | 02185574d64e82c51c123a07ac0c1104f15285fe | |
| parent | 087d8265e4f5a6116b0ee02d2e1854f5409bda4d (diff) | |
Merge from gnulib.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/filemode.c | 2 | ||||
| -rw-r--r-- | lib/sys_stat.in.h | 4 | ||||
| -rw-r--r-- | m4/gnulib-common.m4 | 6 |
4 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2012-12-24 Paul Eggert <eggert@cs.ucla.edu> + + Merge from gnulib, incorporating: + 2012-12-21 AC_PROG_MKDIR_P: port workaround to pre-2.62 Autoconf + 2012-12-20 AC_PROG_MKDIR_P: don't workaround if not buggy + 2012-12-17 filemode, sys_stat: Handle MPX files a la AIX. + 2012-12-21 Akinori MUSHA <knu@iDaemons.org> (tiny change) * Makefile.in (install-arch-dep): Ignore chmod errors. (Bug#13233) diff --git a/lib/filemode.c b/lib/filemode.c index ed8c6c989f..24ffeae7c9 100644 --- a/lib/filemode.c +++ b/lib/filemode.c @@ -78,7 +78,7 @@ ftypelet (mode_t bits) return 'C'; if (S_ISDOOR (bits)) return 'D'; - if (S_ISMPB (bits) || S_ISMPC (bits)) + if (S_ISMPB (bits) || S_ISMPC (bits) || S_ISMPX (bits)) return 'm'; if (S_ISNWK (bits)) return 'n'; diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index ac05ddb5ce..936c0fb8c4 100644 --- a/lib/sys_stat.in.h +++ b/lib/sys_stat.in.h @@ -150,6 +150,10 @@ # endif #endif +#ifndef S_ISMPX /* AIX */ +# define S_ISMPX(m) 0 +#endif + #ifndef S_ISNAM /* Xenix */ # ifdef S_IFNAM # define S_ISNAM(m) (((m) & S_IFMT) == S_IFNAM) diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index 15d2b2b3de..f3ba8d56b1 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -294,6 +294,8 @@ Amsterdam # for interoperability with automake-1.9.6 from autoconf-2.62. # Remove this macro when we can assume autoconf >= 2.62 or # autoconf >= 2.60 && automake >= 1.10. +# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness. +m4_ifndef([AC_AUTOCONF_VERSION],[ m4_ifdef([AC_PROG_MKDIR_P], [ dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed. m4_define([AC_PROG_MKDIR_P], @@ -304,13 +306,15 @@ m4_ifdef([AC_PROG_MKDIR_P], [ [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake MKDIR_P='$(mkdir_p)' AC_SUBST([MKDIR_P])])]) +]) # AC_C_RESTRICT # This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61, # so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++ # works. # This definition can be removed once autoconf >= 2.62 can be assumed. -m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.62]),[-1],[ +# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness. +m4_ifndef([AC_AUTOCONF_VERSION],[ AC_DEFUN([AC_C_RESTRICT], [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict], [ac_cv_c_restrict=no |