diff -r d5f5855e7800 -r a102805611e7 libgnomevfs2-mythtv/m4/as-version.m4 --- a/libgnomevfs2-mythtv/m4/as-version.m4 Mon Oct 23 14:41:30 2006 +0100 +++ b/libgnomevfs2-mythtv/m4/as-version.m4 Thu May 31 16:02:53 2007 +0100 @@ -1,12 +1,18 @@ -dnl version.m4 0.0.5 +dnl as-version.m4 0.1.0 + dnl autostars m4 macro for versioning -dnl thomas@apestaart.org -dnl -dnl AS_VERSION(PACKAGE, PREFIX, MAJOR, MINOR, MICRO, NANO, ACTION_IF_NO_NANO, ACTION_IF_NANO) + +dnl Thomas Vander Stichele + +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 + 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 @@ -18,15 +24,16 @@ 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_VERSION=[$3] - [$2]_MINOR_VERSION=[$4] - [$2]_MICRO_VERSION=[$5] + [$2]_MAJOR=[$3] + [$2]_MINOR=[$4] + [$2]_MICRO=[$5] NANO=[$6] - [$2]_NANO_VERSION=$NANO + [$2]_NANO=$NANO if test "x$NANO" = "x" || test "x$NANO" = "x0"; then AC_MSG_NOTICE(configuring [$1] for release) @@ -37,23 +44,24 @@ else AC_MSG_NOTICE(configuring [$1] for development with nano $NANO) VERSION=[$3].[$4].[$5].$NANO - [$2]_RELEASE=`date +%Y%m%d_%H%M%S` + [$2]_RELEASE=0.`date +%Y%m%d.%H%M%S` dnl execute action ifelse([$8], , :, [$8]) fi - [$2]_VERSION=$VERSION - AC_DEFINE_UNQUOTED([$2]_VERSION, "$[$2]_VERSION", [Define the version]) - AC_SUBST([$2]_VERSION) - + [$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_VERSION) - AC_SUBST([$2]_MINOR_VERSION) - AC_SUBST([$2]_MICRO_VERSION) - AC_SUBST([$2]_NANO_VERSION) + 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) ]) +