[gnome-panel] use AX_ZONEINFO to find zoneinfo directory



commit ae631df176baffe3ba18d867aaed6289d50c98d8
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Nov 30 14:55:06 2016 +0200

    use AX_ZONEINFO to find zoneinfo directory

 applets/clock/system-timezone.c |    8 ++++++++
 applets/clock/system-timezone.h |    7 -------
 configure.ac                    |   12 +++++-------
 3 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/applets/clock/system-timezone.c b/applets/clock/system-timezone.c
index 3b58c41..04b6528 100644
--- a/applets/clock/system-timezone.c
+++ b/applets/clock/system-timezone.c
@@ -44,6 +44,8 @@
  * in some cases: eg, in tzdata2008b, Asia/Calcutta got renamed to
  * Asia/Kolkata and the old name is not in zone.tab. */
 
+#include "config.h"
+
 #include <string.h>
 #include <unistd.h>
 
@@ -53,6 +55,12 @@
 
 #include "system-timezone.h"
 
+#ifdef HAVE_ZONEINFO
+#define SYSTEM_ZONEINFODIR TZDIR
+#else
+#define SYSTEM_ZONEINFODIR "/usr/share/zoneinfo"
+#endif
+
 /* Files that we look at and that should be monitored */
 #define CHECK_NB 5
 #define ETC_TIMEZONE        "/etc/timezone"
diff --git a/applets/clock/system-timezone.h b/applets/clock/system-timezone.h
index 4e5019d..b001ec3 100644
--- a/applets/clock/system-timezone.h
+++ b/applets/clock/system-timezone.h
@@ -26,13 +26,6 @@
 
 G_BEGIN_DECLS
 
-#ifdef HAVE_SOLARIS
-#define SYSTEM_ZONEINFODIR "/usr/share/lib/zoneinfo/tab"
-#else
-#define SYSTEM_ZONEINFODIR "/usr/share/zoneinfo"
-#endif
-
-
 #define SYSTEM_TIMEZONE_TYPE         (system_timezone_get_type ())
 #define SYSTEM_TIMEZONE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), SYSTEM_TIMEZONE_TYPE, SystemTimezone))
 #define SYSTEM_TIMEZONE_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), SYSTEM_TIMEZONE_TYPE, 
SystemTimezoneClass))
diff --git a/configure.ac b/configure.ac
index 57832f0..7fdeeb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,13 +221,11 @@ dnl yelp-tools stuff
 
 YELP_HELP_INIT
 
-dnl platform test
-case $host in
-*-*-solaris*)
-       ostype=solaris
-       AC_DEFINE(HAVE_SOLARIS, 1, [Define to 1])
-       ;;
-esac
+dnl **************************************************************************
+dnl Find zoneinfo directory
+dnl **************************************************************************
+
+AX_ZONEINFO
 
 dnl **************************************************************************
 dnl Process .in files


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]