Commit ae631df1 authored by Alberts Muktupāvels's avatar Alberts Muktupāvels

use AX_ZONEINFO to find zoneinfo directory

parent 38202cb9
......@@ -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"
......
......@@ -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))
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment