diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-22 14:02:48 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-22 14:02:48 -0700 |
| commit | f518ae90a612e83f8b5148211f54e1f6de445b81 (patch) | |
| tree | 88114fd8a3595c8f9ca3bdb9ea42c6fe887e03b7 /m4 | |
| parent | 92a9cc651ac716a90f87bc1e256c16ed1fa220cc (diff) | |
| download | emacs-f518ae90a612e83f8b5148211f54e1f6de445b81.tar.gz | |
Merge from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/mktime.m4 | 19 | ||||
| -rw-r--r-- | m4/readlink.m4 | 5 |
2 files changed, 21 insertions, 3 deletions
diff --git a/m4/mktime.m4 b/m4/mktime.m4 index 56b2416d619..01167a1ec0e 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,4 +1,4 @@ -# serial 19 +# serial 20 dnl Copyright (C) 2002-2003, 2005-2007, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -234,6 +234,23 @@ AC_DEFUN([gl_FUNC_MKTIME], fi ]) +AC_DEFUN([gl_FUNC_MKTIME_INTERNAL], [ + AC_REQUIRE([gl_FUNC_MKTIME]) + if test $REPLACE_MKTIME = 0; then + dnl BeOS has __mktime_internal in libc, but other platforms don't. + AC_CHECK_FUNC([__mktime_internal], + [AC_DEFINE([mktime_internal], [__mktime_internal], + [Define to the real name of the mktime_internal function.]) + ], + [dnl mktime works but it doesn't export __mktime_internal, + dnl so we need to substitute our own mktime implementation. + REPLACE_MKTIME=1 + AC_LIBOBJ([mktime]) + gl_PREREQ_MKTIME + ]) + fi +]) + # Prerequisites of lib/mktime.c. AC_DEFUN([gl_PREREQ_MKTIME], [ diff --git a/m4/readlink.m4 b/m4/readlink.m4 index a502ca560fe..ec737d3f408 100644 --- a/m4/readlink.m4 +++ b/m4/readlink.m4 @@ -1,4 +1,4 @@ -# readlink.m4 serial 9 +# readlink.m4 serial 10 dnl Copyright (C) 2003, 2007, 2009-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, @@ -48,7 +48,8 @@ AC_DEFUN([gl_FUNC_READLINK], fi ]) -# Like gl_FUNC_READLINK, except prepare for separate compilation (no AC_LIBOBJ). +# Like gl_FUNC_READLINK, except prepare for separate compilation +# (no REPLACE_READLINK, no AC_LIBOBJ). AC_DEFUN([gl_FUNC_READLINK_SEPARATE], [ AC_CHECK_FUNCS_ONCE([readlink]) |