X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ftzset.m4;h=261ad5c501cc8cd2b42908dfa451be27d9a40b72;hb=9a4ef223da492c45a9913fb232e3256044f8115e;hp=4fed1fd7db3633bf44aecc97414c75fdf8b09297;hpb=42d1eda5dcce2d68deab7a642e7f29bcd7144a0d;p=gnulib.git

diff --git a/m4/tzset.m4 b/m4/tzset.m4
index 4fed1fd7d..261ad5c50 100644
--- a/m4/tzset.m4
+++ b/m4/tzset.m4
@@ -1,6 +1,6 @@
-# serial 4
+# serial 6
 
-# Copyright (C) 2003, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2007, 2009-2011 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,6 +13,10 @@
 
 # Written by Paul Eggert and Jim Meyering.
 
+# A placeholder to ensure that this m4 file gets included by aclocal.
+AC_DEFUN([gl_FUNC_TZSET], [])
+
+# Set gl_cv_func_tzset_clobber.
 AC_DEFUN([gl_FUNC_TZSET_CLOBBER],
 [
   AC_REQUIRE([gl_HEADER_SYS_TIME_H])
@@ -34,11 +38,11 @@ main ()
   putenv ("TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00");
   tzset ();
   return (p->tm_year != s.tm_year
-	  || p->tm_mon != s.tm_mon
-	  || p->tm_mday != s.tm_mday
-	  || p->tm_hour != s.tm_hour
-	  || p->tm_min != s.tm_min
-	  || p->tm_sec != s.tm_sec);
+          || p->tm_mon != s.tm_mon
+          || p->tm_mday != s.tm_mday
+          || p->tm_hour != s.tm_hour
+          || p->tm_min != s.tm_min
+          || p->tm_sec != s.tm_sec);
 }
   ]])],
        [gl_cv_func_tzset_clobber=no],
@@ -47,13 +51,4 @@ main ()
 
   AC_DEFINE([HAVE_RUN_TZSET_TEST], [1],
     [Define to 1 if you have run the test for working tzset.])
-
-  if test $gl_cv_func_tzset_clobber = yes; then
-    gl_GETTIMEOFDAY_REPLACE_LOCALTIME
-
-    AC_DEFINE([tzset], [rpl_tzset],
-      [Define to rpl_tzset if the wrapper function should be used.])
-    AC_DEFINE([TZSET_CLOBBERS_LOCALTIME], [1],
-      [Define if tzset clobbers localtime's static buffer.])
-  fi
 ])