diff options
| -rw-r--r-- | configure.ac | 27 | ||||
| -rw-r--r-- | m4/Makefile.am | 1 | ||||
| -rw-r--r-- | m4/as-version.m4 | 66 |
3 files changed, 23 insertions, 71 deletions
diff --git a/configure.ac b/configure.ac index ca6d46a16..390d75c49 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,29 @@ AC_PREREQ([2.59]) -AC_INIT -AC_CONFIG_MACRO_DIR([m4]) +# Making releases: +# set the new version number: +# odd minor -> development series +# even minor -> stable series +# increment micro for each release within a series +# set gabble_release to 1. + +m4_define([gabble_major_version], [0]) +m4_define([gabble_minor_version], [1]) +m4_define([gabble_micro_version], [42]) + +m4_define([gabble_release], [1]) + +# Some magic +m4_define([gabble_base_version], + [gabble_major_version.gabble_minor_version.gabble_micro_version]) +m4_define([gabble_version], + [m4_if(gabble_release, 1, [gabble_base_version], [gabble_base_version]+[`date +%Y%m%d.%H%M%S`])])dnl -AS_VERSION(telepathy-gabble, TELEPATHY_GABBLE_VERSION, 0, 3, 1, 1, WERROR="no", WERROR="yes") +AC_INIT([Telepathy Gabble], [gabble_version], [https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy]) -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) +AS_VERSION(telepathy-gabble, TELEPATHY_GABBLE_VERSION, 0, 1, 38, 1, WERROR="no", WERROR="yes") + +AC_CONFIG_MACRO_DIR([m4]) AM_PROG_LIBTOOL AM_CONFIG_HEADER(config.h) @@ -15,6 +33,7 @@ AC_PROG_CC AC_PROG_CC_STDC AM_PROG_AS + dnl decide on error flags AS_COMPILER_FLAG(-Wall, WALL="yes", WALL="no") diff --git a/m4/Makefile.am b/m4/Makefile.am index 259e3c321..b05c7c9f7 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1,4 +1,3 @@ EXTRA_DIST = \ as-compiler-flag.m4 \ -as-version.m4 \ as-ac-expand.m4 diff --git a/m4/as-version.m4 b/m4/as-version.m4 deleted file mode 100644 index defc887e0..000000000 --- a/m4/as-version.m4 +++ /dev/null @@ -1,66 +0,0 @@ -dnl as-version.m4 0.1.0 - -dnl autostars m4 macro for versioning - -dnl Thomas Vander Stichele <thomas at apestaart dot org> - -dnl $Id: as-version.m4,v 1.1 2005/06/18 18:02:46 burgerman Exp $ - -dnl AS_VERSION(PACKAGE, PREFIX, MAJOR, MINOR, MICRO, NANO, -dnl ACTION-IF-NO-NANO, [ACTION-IF-NANO]) - -dnl example -dnl AS_VERSION(gstreamer, GST_VERSION, 0, 3, 2,) -dnl for a 0.3.2 release version - -dnl this macro -dnl - defines [$PREFIX]_MAJOR, MINOR and MICRO -dnl - if NANO is empty, then we're in release mode, else in cvs/dev mode -dnl - defines [$PREFIX], VERSION, and [$PREFIX]_RELEASE -dnl - executes the relevant action -dnl - AC_SUBST's PACKAGE, VERSION, [$PREFIX] and [$PREFIX]_RELEASE -dnl as well as the little ones -dnl - doesn't call AM_INIT_AUTOMAKE anymore because it prevents -dnl maintainer mode from running ok -dnl -dnl don't forget to put #undef [$2] and [$2]_RELEASE in acconfig.h -dnl if you use acconfig.h - -AC_DEFUN([AS_VERSION], -[ - PACKAGE=[$1] - [$2]_MAJOR=[$3] - [$2]_MINOR=[$4] - [$2]_MICRO=[$5] - NANO=[$6] - [$2]_NANO=$NANO - if test "x$NANO" = "x" || test "x$NANO" = "x0"; - then - AC_MSG_NOTICE(configuring [$1] for release) - VERSION=[$3].[$4].[$5] - [$2]_RELEASE=1 - dnl execute action - ifelse([$7], , :, [$7]) - else - AC_MSG_NOTICE(configuring [$1] for development with nano $NANO) - VERSION=[$3].[$4].[$5].$NANO - [$2]_RELEASE=0.`date +%Y%m%d.%H%M%S` - dnl execute action - ifelse([$8], , :, [$8]) - fi - - [$2]=$VERSION - AC_DEFINE_UNQUOTED([$2], "$[$2]", [Define the version]) - AC_SUBST([$2]) - AC_DEFINE_UNQUOTED([$2]_RELEASE, "$[$2]_RELEASE", [Define the release version]) - AC_SUBST([$2]_RELEASE) - - AC_SUBST([$2]_MAJOR) - AC_SUBST([$2]_MINOR) - AC_SUBST([$2]_MICRO) - AC_SUBST([$2]_NANO) - AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Define the package name]) - AC_SUBST(PACKAGE) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Define the version]) - AC_SUBST(VERSION) -]) |