timegm: complete an old fix

[Bruno Haible]

On 2009-07-28, we changed to use the C++ safe idioms for 'mktime':
<http://lists.gnu.org/archive/html/bug-gnulib/2009-07/msg00112.html>
<http://lists.gnu.org/archive/html/bug-gnulib/2009-07/msg00128.html>

But not completely: I missed that the logic of replacing mktime is
duplicated in m4/timegm.m4.

This fixes the immediate problem. A fix for the code duplication to come later.


2011-05-22  Bruno Haible  <address@hidden>

        timegm: Correct mktime replacement statements.
        * m4/timegm.m4 (gl_PREREQ_TIMEGM): Set REPLACE_MKTIME, instead of
        defining mktime as a C macro. This completes a 2009-07-28 commit.

--- m4/timegm.m4.orig   Sun May 22 15:52:09 2011
+++ m4/timegm.m4        Sun May 22 15:49:13 2011
@@ -32,8 +32,7 @@
       [# 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.])
+       REPLACE_MKTIME=1
        gl_PREREQ_MKTIME])
   fi
 ])

-- 
In memoriam Richard Friedmann <http://de.wikipedia.org/wiki/Richard_Friedmann>