aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-07-22 14:11:44 -0500
committerTed Gould <ted@gould.cx>2011-07-22 14:11:44 -0500
commitf356334fbdcefbaa2f566aaa445be33fca5d50a5 (patch)
tree66c54b3f4272649637ff313faa063db496608555
parent51c6800c6f718c07bd0cd016a5acdf5652f7e9c4 (diff)
parent470d42294db9a759565b4dbf4f2494084b365ea8 (diff)
downloadayatana-indicator-datetime-f356334fbdcefbaa2f566aaa445be33fca5d50a5.tar.gz
ayatana-indicator-datetime-f356334fbdcefbaa2f566aaa445be33fca5d50a5.tar.bz2
ayatana-indicator-datetime-f356334fbdcefbaa2f566aaa445be33fca5d50a5.zip
Autotools cleanup
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac49
-rw-r--r--src/indicator-datetime.c16
3 files changed, 34 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am
index 4de650a..feea4de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = \
libmap \
@@ -16,7 +17,7 @@ dist-hook:
echo Creating ChangeLog && \
( cd "$(top_srcdir)" && \
echo '# Generated by Makefile. Do not edit.'; echo; \
- $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
+ $(top_srcdir)/build-aux/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
|| (rm -f ChangeLog.tmp; \
echo Failed to generate ChangeLog >&2 ); \
@@ -28,7 +29,7 @@ dist-hook:
echo Creating AUTHORS && \
( cd "$(top_srcdir)" && \
echo '# Generated by Makefile. Do not edit.'; echo; \
- $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
+ $(top_srcdir)/build-aux/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
&& mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
|| (rm -f AUTHORS.tmp; \
echo Failed to generate AUTHORS >&2 ); \
diff --git a/configure.ac b/configure.ac
index 2420923..defb12e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,27 +1,31 @@
-
-AC_INIT(indicator-datetime, 0.2.91, ted@canonical.com)
+AC_INIT([indicator-datetime],
+ [0.2.91],
+ [http://bugs.launchpad.net/indicator-datetime],
+ [indicator-datetime],
+ [http://launchpad.net/indicator-datetime])
AC_COPYRIGHT([Copyright 2009,2010 Canonical])
-AC_PREREQ(2.53)
+AC_PREREQ([2.64])
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-datetime, 0.2.91)
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([configure.ac])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
-AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([1.11 -Wall dist-xz])
+AM_MAINTAINER_MODE([enable])
-IT_PROG_INTLTOOL([0.35.0])
+AM_SILENT_RULES([yes])
-AC_ISC_POSIX
+# Check for programs
AC_PROG_CC
AM_PROG_CC_C_O
-AC_STDC_HEADERS
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
+AC_HEADER_STDC
-AC_SUBST(VERSION)
-AC_CONFIG_MACRO_DIR([m4])
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT([disable-static])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AC_ARG_ENABLE([deprecations],
[AS_HELP_STRING([--enable-deprecations],
@@ -108,19 +112,6 @@ PKG_CHECK_MODULES(PREF, gio-2.0 >= $GIO_REQUIRED_VERSION
PKG_CHECK_MODULES(LIBMAP, gio-2.0 >= $GIO_REQUIRED_VERSION
gtk+-3.0 >= $GTK3_REQUIRED_VERSION)
-AC_SUBST(INDICATOR_CFLAGS)
-AC_SUBST(INDICATOR_LIBS)
-
-AC_SUBST(SERVICE_CFLAGS)
-AC_SUBST(SERVICE_LIBS)
-
-AC_SUBST(PREF_CFLAGS)
-AC_SUBST(PREF_LIBS)
-
-AC_SUBST(LIBMAP_CFLAGS)
-AC_SUBST(LIBMAP_LIBS)
-AC_SUBST(LIBMAP_LDFLAGS)
-
###########################
# Grab the GSettings Macros
###########################
@@ -200,6 +191,7 @@ AC_DEFUN([AC_DEFINE_PATH], [
###########################
# Internationalization
###########################
+IT_PROG_INTLTOOL([0.41.0])
GETTEXT_PACKAGE=indicator-datetime
AC_SUBST(GETTEXT_PACKAGE)
@@ -212,7 +204,7 @@ AM_GLIB_GNU_GETTEXT
# Files
###########################
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
libmap/Makefile
src/Makefile
@@ -220,6 +212,7 @@ data/Makefile
tests/Makefile
po/Makefile.in
])
+AC_OUTPUT
###########################
# Results
diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c
index 072253b..163804b 100644
--- a/src/indicator-datetime.c
+++ b/src/indicator-datetime.c
@@ -829,11 +829,13 @@ update_label (IndicatorDatetime * io, GDateTime ** datetime)
static void
update_time (IndicatorDatetime * self)
{
- GDateTime * dt;
+ GDateTime * dt = NULL;
update_label(self, &dt);
timezone_update_all_labels(self);
- setup_timer(self, dt);
- g_date_time_unref(dt);
+ if (dt != NULL) {
+ setup_timer(self, dt);
+ g_date_time_unref(dt);
+ }
return;
}
@@ -857,11 +859,13 @@ timer_func (gpointer user_data)
{
IndicatorDatetime * self = INDICATOR_DATETIME(user_data);
self->priv->timer = 0;
- GDateTime * dt;
+ GDateTime * dt = NULL;
update_label(self, &dt);
timezone_update_all_labels(self);
- setup_timer(self, dt);
- g_date_time_unref(dt);
+ if (dt != NULL) {
+ setup_timer(self, dt);
+ g_date_time_unref(dt);
+ }
return FALSE;
}