Remove this from here.

	* acinclude.m4 (EVO_CHECK_TIMEZONE): Remove this from here.

	* configure.in: Put it here. (Connector no longer needs to share
	it). Also, check "tm_gmtoff" before "timezone", and if we have
	"timezone", check for "altzone" too.

	* acconfig.h: Add HAVE_ALTZONE

svn path=/trunk/; revision=17970

4 files changed, 46 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index 90b822dd39..ee52a5adfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-04  Dan Winship  <danw@ximian.com>
+
+	* acinclude.m4 (EVO_CHECK_TIMEZONE): Remove this from here.
+
+	* configure.in: Put it here. (Connector no longer needs to share
+	it). Also, check "tm_gmtoff" before "timezone", and if we have
+	"timezone", check for "altzone" too.
+
+	* acconfig.h: Add HAVE_ALTZONE
+
 2002-08-28  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* configure.in: e-util now requires soup and gconf flags.
diff --git a/acconfig.h b/acconfig.h
index e4aed8a2d6..0d2011510f 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -11,6 +11,7 @@
 #undef SYSTEM_MAIL_DIR
 #undef HAVE_LDAP
 #undef HAVE_TIMEZONE
+#undef HAVE_ALTZONE
 #undef HAVE_TM_GMTOFF
 #undef HAVE_KRB4
 #undef NEED_KRB_SENDAUTH_PROTO
diff --git a/acinclude.m4 b/acinclude.m4
index a9701d3042..be1d20c998 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -76,36 +76,6 @@ AC_DEFUN(EVO_PURIFY_SUPPORT, [
 ])
 
 
-# EVO_TIMEZONE_CHECK
-# define HAVE_TIMEZONE if there is an external "timezone" variable, or
-# HAVE_TM_GMTOFF if struct tm has a tm_gmtoff member. (Note that
-# timezone and tm_gmtoff have opposite signs.)
-AC_DEFUN(EVO_TIMEZONE_CHECK, [
-	AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,
-		AC_TRY_COMPILE([
-			#include <time.h>
-		], [
-			timezone = 1;
-		], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))
-	if test $ac_cv_var_timezone = yes; then
-		AC_DEFINE(HAVE_TIMEZONE)
-	else
-		AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
-			AC_TRY_COMPILE([
-				#include <time.h>
-				], [
-				struct tm tm;
-				tm.tm_gmtoff = 1;
-				], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
-		if test $ac_cv_struct_tm_gmtoff = yes; then
-			AC_DEFINE(HAVE_TM_GMTOFF)
-		else
-			AC_ERROR(unable to find a way to determine timezone)
-		fi
-	fi
-])
-
-
 # EVO_LDAP_CHECK(default)
 # Add --with-openldap and --with-static-ldap options. --with-openldap
 # defaults to the given value if not specified. If LDAP support is
diff --git a/configure.in b/configure.in
index 7c90b3a189..d7dd2f37ee 100644
--- a/configure.in
+++ b/configure.in
@@ -152,7 +152,41 @@ AC_SUBST(CAMEL_LOCK_HELPER_USER)
 AC_SUBST(CAMEL_LOCK_HELPER_GROUP)
 
 
-EVO_TIMEZONE_CHECK
+dnl ***************
+dnl Timezone checks
+dnl ***************
+AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
+	AC_TRY_COMPILE([
+		#include <time.h>
+		], [
+		struct tm tm;
+		tm.tm_gmtoff = 1;
+		], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
+if test $ac_cv_struct_tm_gmtoff = yes; then
+	AC_DEFINE(HAVE_TM_GMTOFF)
+else
+	AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,
+		AC_TRY_COMPILE([
+			#include <time.h>
+		], [
+			timezone = 1;
+		], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))
+	if test $ac_cv_var_timezone = yes; then
+		AC_DEFINE(HAVE_TIMEZONE)
+		AC_CACHE_CHECK(for altzone variable, ac_cv_var_altzone,
+			AC_TRY_COMPILE([
+				#include <time.h>
+			], [
+				altzone = 1;
+			], ac_cv_var_altzone=yes, ac_cv_var_altzone=no))
+		if test $ac_cv_var_altzone = yes; then
+			AC_DEFINE(HAVE_ALTZONE)
+		fi
+	else
+		AC_ERROR(unable to find a way to determine timezone)
+	fi
+fi
+
 
 AC_CHECK_FUNCS(mkstemp mkdtemp isblank)