Attached. On Wed, Mar 18, 2015 at 8:54 AM, Niels Möller <[email protected]> wrote: > Nikos Mavrogiannopoulos <[email protected]> writes: > >> Anyway for my purposes I only need the major part to distinguish >> between 2 and 3, I'll drop the combined macro if you don't want it. > > I think I'd prefer to drop the combined version number for now. We can > add it later if we find (1) a concrete use-case, and (2) an established > or otherwise desirable convention on precisely how to combine the > version numbers. > > Regards, > /Niels > > -- > Niels Möller. PGP-encrypted email is preferred. Keyid C0B98E26. > Internet email is subject to wholesale government surveillance. > _______________________________________________ > nettle-bugs mailing list > [email protected] > http://lists.lysator.liu.se/mailman/listinfo/nettle-bugs
From 2e88f4d745c6539e647174c1af3701b87174b4ed Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos <[email protected]> Date: Tue, 17 Mar 2015 13:12:13 +0100 Subject: [PATCH] Added version.h with library versioning information
--- Makefile.in | 2 +- configure.ac | 7 ++++++- version.h.in | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 version.h.in diff --git a/Makefile.in b/Makefile.in index abba3cd..e39fd15 100644 --- a/Makefile.in +++ b/Makefile.in @@ -195,7 +195,7 @@ HEADERS = aes.h arcfour.h arctwo.h asn1.h blowfish.h \ md5.h md5-compat.h \ memxor.h \ nettle-meta.h nettle-types.h \ - pbkdf2.h \ + pbkdf2.h version.h \ pgp.h pkcs1.h realloc.h ripemd160.h rsa.h \ salsa20.h sexp.h \ serpent.h sha.h sha1.h sha2.h sha3.h twofish.h \ diff --git a/configure.ac b/configure.ac index 51ab3b3..56f6909 100644 --- a/configure.ac +++ b/configure.ac @@ -16,6 +16,11 @@ LIBNETTLE_MINOR=0 LIBHOGWEED_MAJOR=4 LIBHOGWEED_MINOR=0 +MAJOR_VERSION=`echo $PACKAGE_VERSION | sed 's/\(.*\)\..*/\1/g'` +MINOR_VERSION=`echo $PACKAGE_VERSION | sed 's/.*\.\(.*\)/\1/g'` +AC_SUBST([MAJOR_VERSION]) +AC_SUBST([MINOR_VERSION]) + AC_CANONICAL_HOST # Command line options @@ -895,7 +900,7 @@ if test x$GCC = xyes ; then # inttypes.h. fi -AC_CONFIG_FILES([config.make config.m4 Makefile bignum.h]) +AC_CONFIG_FILES([config.make config.m4 Makefile bignum.h version.h]) AC_CONFIG_FILES([tools/Makefile testsuite/Makefile examples/Makefile]) AC_CONFIG_FILES([nettle.pc hogweed.pc libnettle.map libhogweed.map]) diff --git a/version.h.in b/version.h.in new file mode 100644 index 0000000..036aaf7 --- /dev/null +++ b/version.h.in @@ -0,0 +1,49 @@ +/* version.h + + Information about library version. + + Copyright (C) 2015 Red Hat, Inc. + + This file is part of GNU Nettle. + + GNU Nettle is free software: you can redistribute it and/or + modify it under the terms of either: + + * the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at your + option) any later version. + + or + + * the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your + option) any later version. + + or both in parallel, as here. + + GNU Nettle is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received copies of the GNU General Public License and + the GNU Lesser General Public License along with this program. If + not, see http://www.gnu.org/licenses/. +*/ + +#ifndef NETTLE_VERSION_H_INCLUDED +#define NETTLE_VERSION_H_INCLUDED + +#ifdef __cplusplus +extern "C" { +#endif + +/* Individual version numbers in decimal */ +#define NETTLE_VERSION_MAJOR @MAJOR_VERSION@ +#define NETTLE_VERSION_MINOR @MINOR_VERSION@ + +#ifdef __cplusplus +} +#endif + +#endif /* NETTLE_VERSION_H_INCLUDED */ -- 2.1.0
_______________________________________________ nettle-bugs mailing list [email protected] http://lists.lysator.liu.se/mailman/listinfo/nettle-bugs
