X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ftimegm.m4;h=ca97eb2529cd1f926125e3d7ef68af907812cfc4;hb=4c55ba7831f4ce8d3c7addcb20be418330a22239;hp=010a6f20a61dc9e266814785ea3c9841b2c4526e;hpb=a53bd58c8300977941a9b9f0a7a4438ea6ce3277;p=gnulib.git

diff --git a/m4/timegm.m4 b/m4/timegm.m4
index 010a6f20a..ca97eb252 100644
--- a/m4/timegm.m4
+++ b/m4/timegm.m4
@@ -1,5 +1,5 @@
-# timegm.m4 serial 7
-dnl Copyright (C) 2003, 2007, 2009, 2010 Free Software Foundation, Inc.
+# timegm.m4 serial 9
+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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,16 +9,16 @@ AC_DEFUN([gl_FUNC_TIMEGM],
   AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS])
   AC_REQUIRE([gl_FUNC_MKTIME])
   REPLACE_TIMEGM=0
-  if test $ac_cv_func_working_mktime = no; then
-    # Assume that timegm is buggy if mktime is.
-    REPLACE_TIMEGM=1
-  else
-    AC_CHECK_FUNCS([timegm])
-    if test $ac_cv_func_timegm != yes; then
+  AC_CHECK_FUNCS_ONCE([timegm])
+  if test $ac_cv_func_timegm = yes; then
+    if test $ac_cv_func_working_mktime = no; then
+      # Assume that timegm is buggy if mktime is.
       REPLACE_TIMEGM=1
     fi
+  else
+    HAVE_TIMEGM=0
   fi
-  if test $REPLACE_TIMEGM = 1; then
+  if test $HAVE_TIMEGM = 0 || test $REPLACE_TIMEGM = 1; then
     AC_LIBOBJ([timegm])
     gl_PREREQ_TIMEGM
   fi
@@ -26,15 +26,5 @@ AC_DEFUN([gl_FUNC_TIMEGM],
 
 # 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
+  :
 ])