X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ftimegm.m4;h=caabc86ade6c350c379b56ac065cce24eb3a7cb0;hb=c6d98d8cd52c163c2dba42a41da25356c4dad9f0;hp=bdaafbff803d0705a96c4237f4e0560dc9a4d58a;hpb=1ecf90d34bc48369746e4c8c8d093a57d175a68c;p=gnulib.git diff --git a/m4/timegm.m4 b/m4/timegm.m4 index bdaafbff8..caabc86ad 100644 --- a/m4/timegm.m4 +++ b/m4/timegm.m4 @@ -1,5 +1,5 @@ -# timegm.m4 serial 8 -dnl Copyright (C) 2003, 2007, 2009, 2010 Free Software Foundation, Inc. +# timegm.m4 serial 11 +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. @@ -11,30 +11,16 @@ AC_DEFUN([gl_FUNC_TIMEGM], 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 + if test $gl_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 $HAVE_TIMEGM = 0 || test $REPLACE_TIMEGM = 1; then - AC_LIBOBJ([timegm]) - gl_PREREQ_TIMEGM - fi ]) # 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 + : ])