From 16f9d99cacc9e873e570964ef1babfffe93be65e Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Sat, 27 Feb 2016 03:59:33 -0500 Subject: [PATCH] configure.ac: use macros for version name and description Signed-off-by: Philippe Proulx Signed-off-by: Mathieu Desnoyers --- configure.ac | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 9f238774..9f48768d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,15 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. +dnl Version infos m4_define([V_MAJOR], [2]) m4_define([V_MINOR], [8]) m4_define([V_PATCH], [0]) m4_define([V_EXTRA], [pre]) m4_define([V_STRING], [V_MAJOR.V_MINOR.V_PATCH]) m4_ifdef([V_EXTRA], [m4_append([V_STRING], [-V_EXTRA])]) +m4_define([V_NAME], [[Herbe à Détourne]]) +m4_define([V_DESC], [[Brewed with unrestrained amounts of Citra hop, the Herbe à Détourne is a fantastic New World Tripel brewed by "Dieu du Ciel!". Aromas of mango, cantaloupe melon and passion fruit, combined with a controlled bitter finish, unite in making this smooth golden-orange beer stand apart.]]) AC_INIT([lttng-ust],V_STRING,[mathieu dot desnoyers at efficios dot com]) @@ -42,13 +45,6 @@ AC_SUBST([MAJOR_VERSION], [V_MAJOR]) AC_SUBST([MINOR_VERSION], [V_MINOR]) AC_SUBST([PATCHLEVEL_VERSION], [V_PATCH]) -version_name="Herbe à Détourne" -version_description='Brewed with unrestrained amounts of Citra hop, the Herbe à Détourne is a fantastic New World Tripel brewed by "Dieu du Ciel!". Aromas of mango, cantaloupe melon and passion fruit, combined with a controlled bitter finish, unite in making this smooth golden-orange beer stand apart.' -version_description_c=$(echo $version_description | sed 's/"/\\"/g') - -AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], [UST version name]) -AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description_c"], [UST version description]) - AC_PROG_GREP AC_PROG_LN_S # libtool link_all_deplibs fixup. See http://bugs.lttng.org/issues/321. @@ -423,9 +419,9 @@ AC_CONFIG_LINKS([ AC_OUTPUT +AS_ECHO(["m4_bpatsubst(V_NAME, ["], [\\"])"]) AS_ECHO() -AS_ECHO("Version name: $version_name") -AS_ECHO("$version_description") +AS_ECHO(["m4_bpatsubst(V_DESC, ["], [\\"])"]) # Report on the configuration options AS_ECHO() -- 2.34.1