Commit 62507229 authored by Vincent Untz's avatar Vincent Untz Committed by Vincent Untz
Browse files

add new define CLOCK_TIME_UTILITY in compile line stop hardcoding the

2007-05-08  Vincent Untz  <vuntz@gnome.org>

	* Makefile.am: add new define CLOCK_TIME_UTILITY in compile line
	* clock.c: stop hardcoding the various utilities out there to setup
	the time and date and use the one passed in configure
	Fix bug #436837

svn path=/trunk/; revision=10347
parent fb19465b
2007-05-08 Vincent Untz <vuntz@gnome.org>
* Makefile.am: add new define CLOCK_TIME_UTILITY in compile line
* clock.c: stop hardcoding the various utilities out there to setup
the time and date and use the one passed in configure
Fix bug #436837
2007-05-08 Vincent Untz <vuntz@gnome.org>
* clock.schemas.in: show date by default because it seems the majority
......
......@@ -8,8 +8,9 @@ INCLUDES = \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DPREFIX=\""$(prefix)"\" \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-DPREFIX=\""$(prefix)"\" \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DCLOCK_TIME_UTILITY="\"$(CLOCK_TIME_UTILITY)\""
if HAVE_LIBECAL
CALENDAR_SOURCES = \
......
......@@ -80,11 +80,11 @@ static const char* KEY_CONFIG_TOOL = "config_tool";
static const char* KEY_CUSTOM_FORMAT = "custom_format";
static const char* KEY_SHOW_WEEK = "show_week_numbers";
#define FALLBACK_CONFIG_TOOL "time-admin"
static const char *clock_config_tools [] = {
"system-config-date",
"redhat-config-date",
"/sbin/yast2 timezone",
"time-admin",
CLOCK_TIME_UTILITY,
FALLBACK_CONFIG_TOOL
};
/* Needs to match the indices in the combo */
......
Supports Markdown
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