From: Bruno Haible <bruno@clisp.org>
Date: Sat, 3 Apr 2010 17:33:13 +0000 (+0200)
Subject: timegm: Assume declaration if function exists.
X-Git-Tag: v0.1~4357
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=a53bd58c8300977941a9b9f0a7a4438ea6ce3277;p=gnulib.git

timegm: Assume declaration if function exists.
---

diff --git a/ChangeLog b/ChangeLog
index 2a88359b3..ecea28d75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-04-03  Bruno Haible  <bruno@clisp.org>
 
+	timegm: Assume declaration if function exists.
+	* m4/timegm.m4 (gl_FUNC_TIMEGM): Assume timegm is declared if and only
+	if it exists. Don't clobber ac_cv_func_timegm.
+
+2010-04-03  Bruno Haible  <bruno@clisp.org>
+
 	time_r: Fix C++ test error on mingw.
 	* lib/time.in.h (localtime_r, gmtime_r): Use modern idiom.
 	* m4/time_r.m4 (gl_TIME_R): When localtime_r does not exist, set
diff --git a/m4/timegm.m4 b/m4/timegm.m4
index 9168c09b8..010a6f20a 100644
--- a/m4/timegm.m4
+++ b/m4/timegm.m4
@@ -1,4 +1,4 @@
-# timegm.m4 serial 6
+# timegm.m4 serial 7
 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,
@@ -8,18 +8,18 @@ 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.
-    AC_LIBOBJ([timegm])
-    ac_cv_func_timegm=no
+    REPLACE_TIMEGM=1
   else
-    AC_REPLACE_FUNCS([timegm])
-  fi
-  REPLACE_TIMEGM=1
-  if test $ac_cv_func_timegm = yes; then
-    AC_CHECK_DECLS([timegm], [REPLACE_TIMEGM=0], [], [#include <time.h>])
+    AC_CHECK_FUNCS([timegm])
+    if test $ac_cv_func_timegm != yes; then
+      REPLACE_TIMEGM=1
+    fi
   fi
   if test $REPLACE_TIMEGM = 1; then
+    AC_LIBOBJ([timegm])
     gl_PREREQ_TIMEGM
   fi
 ])