X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ftimegm.m4;h=bdaafbff803d0705a96c4237f4e0560dc9a4d58a;hb=e4c754e34096c0703a41f6c0e9fb7cc1f007b3ed;hp=94305aefa922e2d85c532696b3b7e28727932e08;hpb=7b224479dcac36108cbf435aff9b45767143ed25;p=gnulib.git

diff --git a/m4/timegm.m4 b/m4/timegm.m4
index 94305aefa..bdaafbff8 100644
--- a/m4/timegm.m4
+++ b/m4/timegm.m4
@@ -1,26 +1,27 @@
-# timegm.m4 serial 2
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# timegm.m4 serial 8
+dnl Copyright (C) 2003, 2007, 2009, 2010 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.
 
 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
+  REPLACE_TIMEGM=0
+  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
-    AC_REPLACE_FUNCS(timegm)
+    HAVE_TIMEGM=0
   fi
-  if test $ac_cv_func_timegm = no; then
+  if test $HAVE_TIMEGM = 0 || test $REPLACE_TIMEGM = 1; then
+    AC_LIBOBJ([timegm])
     gl_PREREQ_TIMEGM
   fi
-
-  AC_CHECK_DECLS([timegm], , , [#include <time.h>])
 ])
 
 # Prerequisites of lib/timegm.c.
@@ -28,12 +29,12 @@ 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, ,
+    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.])
+         [Define to rpl_mktime if the replacement function should be used.])
        gl_PREREQ_MKTIME])
   fi
 ])