diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-06-17 14:26:48 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-06-17 14:26:48 +0100 |
| commit | b8a7c0ceca03f8cdd3cd7ec3a9c24cfb72695957 (patch) | |
| tree | a23e32874b020d255a74614c9f9dc4549967ee50 | |
| parent | 33baca24c2ef5d4f1202898f95ed5f79c02b8c98 (diff) | |
Remove tpl_released, which is redundant with the way we use nano versions
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 20542d5e3..5cd918769 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,7 @@ -dnl If not 1, append datestamp to the version number -m4_define(tpl_released, 0) - m4_define([tpl_major_version], [0]) m4_define([tpl_minor_version], [1]) m4_define([tpl_micro_version], [2]) -m4_define([tpl_nano_version], [0]) +m4_define([tpl_nano_version], [1]) dnl Display the nano_version only if it's not '0' m4_define([tpl_base_version], @@ -14,7 +11,7 @@ m4_define([tpl_full_version], [tpl_base_version].[tpl_nano_version])]) m4_define(tpl_maybe_datestamp, - m4_esyscmd([if test x]tpl_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) + m4_esyscmd([if test x]tpl_nano_version[ != x0; then date +.%Y%m%d | tr -d '\n\r'; fi])) m4_define(tpl_version, tpl_full_version[]tpl_maybe_datestamp) @@ -26,7 +23,7 @@ DBUS_SERVICES_DIR="$datadir/dbus-1/services" AC_SUBST(DBUS_SERVICES_DIR) AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is]) -ifelse(tpl_released, 1, +ifelse(tpl_nano_version, 0, [ official_release=yes ], [ official_release=no ]) |