Mercurial > hg > octave-nkf > gnulib-hg
changeset 13130:5735734700f2
timegm: Assume declaration if function exists.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 03 Apr 2010 19:33:13 +0200 |
| parents | 3a2049062a71 |
| children | 9bf8948cd6b6 |
| files | ChangeLog m4/timegm.m4 |
| diffstat | 2 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +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.
--- 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_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 ])