From: Bruno Haible Date: Sun, 8 May 2011 16:17:25 +0000 (+0200) Subject: gettimeofday: Move AC_LIBOBJ invocations to module description. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f0c29413faab5bf83447642b9d70fceeb80f1c1;p=pspp gettimeofday: Move AC_LIBOBJ invocations to module description. * m4/gettimeofday.m4 (gl_FUNC_GETTIMEOFDAY, gl_GETTIMEOFDAY_REPLACE_LOCALTIME): Move AC_LIBOBJ and gl_PREREQ_GETTIMEOFDAY invocations from here... * modules/gettimeofday (configure.ac): ... to here. --- diff --git a/ChangeLog b/ChangeLog index c6d65579f2..f2bb8acb8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-05-08 Bruno Haible + + gettimeofday: Move AC_LIBOBJ invocations to module description. + * m4/gettimeofday.m4 (gl_FUNC_GETTIMEOFDAY, + gl_GETTIMEOFDAY_REPLACE_LOCALTIME): Move AC_LIBOBJ and + gl_PREREQ_GETTIMEOFDAY invocations from here... + * modules/gettimeofday (configure.ac): ... to here. + 2011-05-08 Bruno Haible gettimeofday, tzset: Respect rules for use of AC_LIBOBJ. diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index 461341183c..47c1e1d316 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,4 +1,4 @@ -# serial 16 +# serial 17 # Copyright (C) 2001-2003, 2005, 2007, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -17,8 +17,6 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY], gl_gettimeofday_timezone=void if test $ac_cv_func_gettimeofday != yes; then HAVE_GETTIMEOFDAY=0 - AC_LIBOBJ([gettimeofday]) - gl_PREREQ_GETTIMEOFDAY else gl_FUNC_GETTIMEOFDAY_CLOBBER AC_CACHE_CHECK([for gettimeofday with POSIX signature], @@ -51,8 +49,6 @@ int gettimeofday (struct timeval *restrict, struct timezone *restrict); gl_gettimeofday_timezone='struct timezone' elif test $gl_cv_func_gettimeofday_posix_signature != yes; then REPLACE_GETTIMEOFDAY=1 - AC_LIBOBJ([gettimeofday]) - gl_PREREQ_GETTIMEOFDAY fi m4_ifdef([gl_FUNC_TZSET_CLOBBER], [ gl_FUNC_TZSET_CLOBBER @@ -116,8 +112,6 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER], ]) AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [ - AC_LIBOBJ([gettimeofday]) - gl_PREREQ_GETTIMEOFDAY AC_DEFINE([gmtime], [rpl_gmtime], [Define to rpl_gmtime if the replacement function should be used.]) AC_DEFINE([localtime], [rpl_localtime], diff --git a/modules/gettimeofday b/modules/gettimeofday index 979f601d07..b4bdcc37c7 100644 --- a/modules/gettimeofday +++ b/modules/gettimeofday @@ -10,6 +10,10 @@ sys_time configure.ac: gl_FUNC_GETTIMEOFDAY +if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then + AC_LIBOBJ([gettimeofday]) + gl_PREREQ_GETTIMEOFDAY +fi gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) Makefile.am: