Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 8abed2e5bf8e7815b11df6d22042d5f0ac8efcb0 Mon Sep 17 00:00:00 2001 |
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
| 3 | Date: Tue, 5 May 2015 13:43:35 +0200 |
| 4 | Subject: [PATCH] configure.ac: don't use dash in m4 macro names |
| 5 | |
| 6 | * otherwise it doesn't get expanded and vala-dbus-binding-tool ends with version 'vala-dbus-binding-tool_version' |
| 7 | |
| 8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 9 | --- |
| 10 | configure.ac | 10 +++++----- |
| 11 | 1 file changed, 5 insertions(+), 5 deletions(-) |
| 12 | |
| 13 | diff --git a/configure.ac b/configure.ac |
| 14 | index 48f007c..18d0bde 100644 |
| 15 | --- a/configure.ac |
| 16 | +++ b/configure.ac |
| 17 | @@ -1,9 +1,9 @@ |
| 18 | -m4_define([vala-dbus-binding-tool_released], [0]) |
| 19 | -m4_define([vala-dbus-binding-tool_base_version], [1.0]) |
| 20 | -m4_define([vala-dbus-binding-tool_maybe_gitrev], m4_if(vala-dbus-binding-tool_released, [1], [], [m4_esyscmd([git show-ref --hash=5 HEAD | tr -d '\n\r'])])) |
| 21 | -m4_define([vala-dbus-binding-tool_version], m4_if(vala-dbus-binding-tool_released, [1], [vala-dbus-binding-tool_base_version], [vala-dbus-binding-tool_base_version-vala-dbus-binding-tool_maybe_gitrev])) |
| 22 | +m4_define([vala_dbus_binding_tool_released], [0]) |
| 23 | +m4_define([vala_dbus_binding_tool_base_version], [1.0]) |
| 24 | +m4_define([vala_dbus_binding_tool_maybe_gitrev], m4_if(vala_dbus_binding_tool_released, [1], [], [m4_esyscmd([git show-ref --hash=5 HEAD | tr -d '\n\r'])])) |
| 25 | +m4_define([vala_dbus_binding_tool_version], m4_if(vala_dbus_binding_tool_released, [1], [vala_dbus_binding_tool_base_version], [vala_dbus_binding_tool_base_version-vala_dbus_binding_tool_maybe_gitrev])) |
| 26 | |
| 27 | -AC_INIT([vala-dbus-binding-tool], [vala-dbus-binding-tool_version], [fso@openphoenux.org], [vala-dbus-binding-tool]) |
| 28 | +AC_INIT([vala-dbus-binding-tool], [vala_dbus_binding_tool_version], [fso@openphoenux.org], [vala-dbus-binding-tool]) |
| 29 | AC_CONFIG_SRCDIR([src/Makefile.am]) |
| 30 | AC_CONFIG_HEADERS(config.h) |
| 31 | AM_INIT_AUTOMAKE([dist-bzip2]) |
| 32 | -- |
| 33 | 2.3.5 |
| 34 | |