Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'

[gnulib.git] / m4 / timegm.m4

diff --git a/m4/timegm.m4 b/m4/timegm.m4
index ca903b1..f14b773 100644 (file)
--- a/m4/timegm.m4
+++ b/m4/timegm.m4
@@ -1,5 +1,5 @@
-# timegm.m4 serial 5
-dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+# timegm.m4 serial 11
+dnl Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,33 +8,19 @@ AC_DEFUN([gl_FUNC_TIMEGM],
 [
   AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS])
   AC_REQUIRE([gl_FUNC_MKTIME])
-  if test $ac_cv_func_working_mktime = no; then
-    # Assume that timegm is buggy if mktime is.
-    AC_LIBOBJ([timegm])
-    ac_cv_func_timegm=no
-  else
-    AC_REPLACE_FUNCS(timegm)
-  fi
-  REPLACE_TIMEGM=1
+  REPLACE_TIMEGM=0
+  AC_CHECK_FUNCS_ONCE([timegm])
   if test $ac_cv_func_timegm = yes; then
-    AC_CHECK_DECLS([timegm], [REPLACE_TIMEGM=0], [], [#include <time.h>])
-  fi
-  if test $REPLACE_TIMEGM = 1; then
-    gl_PREREQ_TIMEGM
+    if test $gl_cv_func_working_mktime = no; then
+      # Assume that timegm is buggy if mktime is.
+      REPLACE_TIMEGM=1
+    fi
+  else
+    HAVE_TIMEGM=0
   fi
 ])
 
 # Prerequisites of lib/timegm.c.
 AC_DEFUN([gl_PREREQ_TIMEGM], [
-  AC_REQUIRE([gl_TIME_R])
-  AC_REQUIRE([gl_FUNC_MKTIME])
-  if test $ac_cv_func_working_mktime = yes; then
-    AC_CHECK_FUNC(__mktime_internal, ,
-      [# mktime works but it doesn't export __mktime_internal,
-       # so we need to substitute our own mktime implementation.
-       AC_LIBOBJ([mktime])
-       AC_DEFINE([mktime], [rpl_mktime],
-        [Define to rpl_mktime if the replacement function should be used.])
-       gl_PREREQ_MKTIME])
-  fi
+  :
 ])