From e4c7b36a6d0cb19cc4729ad022a16fe7b6b4a4a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20D=C3=A9saulniers?= <sim.desaulniers@gmail.com> Date: Mon, 25 Jul 2016 17:03:57 -0400 Subject: [PATCH] autotools: versionning consistent with CMake --- configure.ac | 13 ++++++++++++- src/Makefile.am | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index f7335973..9c3a50a5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,21 @@ -AC_INIT(opendht, 0.6.2) +dnl define macros +m4_define([opendht_major_version], 0) +m4_define([opendht_minor_version], 6) +m4_define([opendht_patch_version], 2) +m4_define([opendht_version], + [opendht_major_version.opendht_minor_version.opendht_patch_version]) + +AC_INIT(opendht, [opendht_version]) AC_CONFIG_AUX_DIR(ac) AM_INIT_AUTOMAKE([foreign subdir-objects]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_HOST +AC_SUBST(OPENDHT_MAJOR_VERSION, opendht_major_version) +AC_SUBST(OPENDHT_MINOR_VERSION, opendht_minor_version) +AC_SUBST(OPENDHT_PATCH_VERSION, opendht_patch_version) + AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [Build in debug mode, adds stricter warnings, disables optimization])) AS_IF([test "x$enable_debug" = "xyes"], [CXXFLAGS="${CXXFLAGS} -g -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -O0"], diff --git a/src/Makefile.am b/src/Makefile.am index 22b49464..f29287a5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = argon2 lib_LTLIBRARIES = libopendht.la AM_CPPFLAGS = -I../include/opendht -libopendht_la_LDFLAGS = @LDFLAGS@ @GnuTLS_LIBS@ @Nettle_LIBS@ +libopendht_la_LDFLAGS = @LDFLAGS@ @GnuTLS_LIBS@ @Nettle_LIBS@ -version-number @OPENDHT_MAJOR_VERSION@:@OPENDHT_MINOR_VERSION@:@OPENDHT_PATCH_VERSION@ libopendht_la_LIBADD = ./argon2/libargon2.la libopendht_la_SOURCES = \ -- GitLab