X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ftimegm.m4;h=be323c9b0f287be0ceee17d62deab328600d52a1;hb=4097b52187106b6a2940d28968cfecd4e53f9b4e;hp=82e9d66be461147fc98ffdcd484fe95a13ad5cad;hpb=44d7c1c1f004fa9bfb8ec3948de2671a7958cf5b;p=gnulib.git

diff --git a/m4/timegm.m4 b/m4/timegm.m4
index 82e9d66be..be323c9b0 100644
--- a/m4/timegm.m4
+++ b/m4/timegm.m4
@@ -1,24 +1,27 @@
-# timegm.m4 serial 3
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+# timegm.m4 serial 6
+dnl Copyright (C) 2003, 2007, 2009 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
   else
-    AC_REPLACE_FUNCS(timegm)
+    AC_REPLACE_FUNCS([timegm])
   fi
-  if test $ac_cv_func_timegm = no; then
+  REPLACE_TIMEGM=1
+  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
   fi
-
-  AC_CHECK_DECLS([timegm], , , [#include <time.h>])
 ])
 
 # Prerequisites of lib/timegm.c.
@@ -26,7 +29,7 @@ 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])