From 99d78dcc972c7584a59d6c1df7660eeb9c677b7a Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Graber?= Date: Mon, 21 Dec 2015 12:52:33 -0500 Subject: [PATCH] change version to 2.0.0.beta1 in configure.ac MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Note that LXC 2.0 remains backward compatible with 1.0, so the ABI version is 1.2, not 2.0. Signed-off-by: Stéphane Graber --- configure.ac | 8 +++++--- src/lxc/Makefile.am | 8 ++++---- src/lxc/version.h.in | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index e2827ac6c..74edf91ac 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,11 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -m4_define([lxc_version_major], 1) -m4_define([lxc_version_minor], 1) +m4_define([lxc_version_major], 2) +m4_define([lxc_version_minor], 0) m4_define([lxc_version_micro], 0) -m4_define([lxc_version_beta], []) +m4_define([lxc_version_beta], beta1) +m4_define([lxc_version_abi], 1.2.0) m4_define([lxc_version_base], [lxc_version_major.lxc_version_minor.lxc_version_micro]) m4_define([lxc_version], @@ -21,6 +22,7 @@ AC_SUBST(LXC_VERSION_BETA, lxc_version_beta) AC_SUBST([LXC_VERSION_MAJOR], [lxc_version_major]) AC_SUBST([LXC_VERSION_MINOR], [lxc_version_minor]) AC_SUBST([LXC_VERSION_MICRO], [lxc_version_micro]) +AC_SUBST([LXC_VERSION_ABI], [lxc_version_abi]) AC_SUBST([LXC_VERSION], [lxc_version]) AC_CONFIG_SRCDIR([configure.ac]) diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am index 44945d070..cd160865a 100644 --- a/src/lxc/Makefile.am +++ b/src/lxc/Makefile.am @@ -160,7 +160,7 @@ liblxc_so_CFLAGS = -fPIC -DPIC $(AM_CFLAGS) -pthread liblxc_so_LDFLAGS = \ -pthread \ -shared \ - -Wl,-soname,liblxc.so.$(firstword $(subst ., ,$(VERSION))) + -Wl,-soname,liblxc.so.$(firstword $(subst ., ,@LXC_VERSION_ABI@)) liblxc_so_LDADD = $(CAP_LIBS) $(APPARMOR_LIBS) $(SELINUX_LIBS) $(SECCOMP_LIBS) @@ -268,10 +268,10 @@ endif install-exec-local: install-soPROGRAMS mkdir -p $(DESTDIR)$(datadir)/lxc install -c -m 644 lxc.functions $(DESTDIR)$(datadir)/lxc - mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) + mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.@LXC_VERSION_ABI@ cd $(DESTDIR)$(libdir); \ - ln -sf liblxc.so.$(VERSION) liblxc.so.$(firstword $(subst ., ,$(VERSION))); \ - ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so + ln -sf liblxc.so.@LXC_VERSION_ABI@ liblxc.so.$(firstword $(subst ., ,@LXC_VERSION_ABI@)); \ + ln -sf liblxc.so.$(firstword $(subst ., ,@LXC_VERSION_ABI@)) liblxc.so install-exec-hook: chmod u+s $(DESTDIR)$(libexecdir)/lxc/lxc-user-nic diff --git a/src/lxc/version.h.in b/src/lxc/version.h.in index 803a46e46..cd1b6ebc2 100644 --- a/src/lxc/version.h.in +++ b/src/lxc/version.h.in @@ -26,6 +26,7 @@ #define LXC_VERSION_MAJOR @LXC_VERSION_MAJOR@ #define LXC_VERSION_MINOR @LXC_VERSION_MINOR@ #define LXC_VERSION_MICRO @LXC_VERSION_MICRO@ +#define LXC_VERSION_ABI "@LXC_VERSION_ABI@" #define LXC_VERSION "@LXC_VERSION@" #endif -- 2.47.2