aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fca05a527c2..1cb5ed3585f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12012-07-11 Paul Eggert <eggert@cs.ucla.edu>
2
3 * configure.ac (tzset): Remove check that's redundant with gnulib.
4
12012-07-11 Glenn Morris <rgm@gnu.org> 52012-07-11 Glenn Morris <rgm@gnu.org>
2 6
3 * configure.ac (CLASH_DETECTION): Define unconditionally. 7 * configure.ac (CLASH_DETECTION): Define unconditionally.
diff --git a/configure.ac b/configure.ac
index 82201318515..e55c40fe77c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3021,7 +3021,7 @@ AC_SUBST(KRB5LIB)
3021AC_SUBST(DESLIB) 3021AC_SUBST(DESLIB)
3022AC_SUBST(KRB4LIB) 3022AC_SUBST(KRB4LIB)
3023 3023
3024AC_CHECK_FUNCS(tzset) 3024AC_CHECK_FUNCS_ONCE(tzset)
3025AC_MSG_CHECKING(whether localtime caches TZ) 3025AC_MSG_CHECKING(whether localtime caches TZ)
3026AC_CACHE_VAL(emacs_cv_localtime_cache, 3026AC_CACHE_VAL(emacs_cv_localtime_cache,
3027[if test x$ac_cv_func_tzset = xyes; then 3027[if test x$ac_cv_func_tzset = xyes; then