Skip to content

Commit

Permalink
Add LXC version information to version.h
Browse files Browse the repository at this point in the history
So that applications can get the LXC version number at compile time.

This can be used to make applications/bindings that support compiling against
multiple versions of LXC.

Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
  • Loading branch information
caglar10ur authored and stgraber committed Dec 2, 2013
1 parent 0a3673e commit a22185d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -74,6 +74,7 @@ src/lxc/lxc-version
src/lxc/lxc-wait
src/lxc/legacy/lxc-ls
src/lxc/lxc-user-nic
src/lxc/version.h

src/python-lxc/build/
src/python-lxc/lxc/__pycache__/
Expand Down
7 changes: 6 additions & 1 deletion configure.ac
Expand Up @@ -14,6 +14,11 @@ AC_INIT([lxc], [lxc_version])
AC_SUBST(LXC_VERSION_BASE, lxc_version_base)
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], [lxc_version])

AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_HEADERS([src/config.h])
Expand Down Expand Up @@ -554,7 +559,7 @@ AC_CONFIG_FILES([
src/lxc/lxc-start-ephemeral
src/lxc/legacy/lxc-ls
src/lxc/lxc.functions
src/lxc/version.h
src/python-lxc/Makefile
src/lua-lxc/Makefile
Expand Down
9 changes: 7 additions & 2 deletions src/lxc/version.h → src/lxc/version.h.in
Expand Up @@ -20,8 +20,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _version_h
#define _version_h
#ifndef _VERSION_H
#define _VERSION_H

#define LXC_VERSION_MAJOR @LXC_VERSION_MAJOR@
#define LXC_VERSION_MINOR @LXC_VERSION_MINOR@
#define LXC_VERSION_MICRO @LXC_VERSION_MICRO@
#define LXC_VERSION "@LXC_VERSION@"

/*
* Returns the version number of the library
Expand Down

0 comments on commit a22185d

Please sign in to comment.