From ffe184054fe6b758c17c4462d6e85ad7c4b4e2a6 Mon Sep 17 00:00:00 2001 From: Todd A Ouska Date: Fri, 29 Apr 2011 13:08:05 -0700 Subject: [PATCH] 2.0.0 rc1 versioning --- configure.in | 16 +++++++++++++++- ctaocrypt/include/config.h | 6 +++--- include/openssl/ssl.h | 2 +- src/include.am | 2 +- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index d3b78e96b..3f30a0f89 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT(cyassl,1.9.6,http://www.yassl.com) # !!! also change in ssl.h !!! +AC_INIT(cyassl,2.0.0rc1,http://www.yassl.com) # !!! also change in ssl.h !!! AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(ctaocrypt/include/config.h) AC_CONFIG_MACRO_DIR([m4]) @@ -6,6 +6,20 @@ AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE(subdir-objects) +#shared library versioning +CYASSL_LIBRARY_VERSION=2:0:0 +# | | | +# +------+ | +---+ +# | | | +# current:revision:age +# | | | +# | | +- increment if interfaces have been added +# | | set to zero if interfaces have been removed or changed +# | +- increment if source code has changed +# | set to zero if current is incremented +# +- increment if interfaces have been added, removed or changed +AC_SUBST(CYASSL_LIBRARY_VERSION) + # make sure configure doesn't add to CFLAGS CFLAGS="$CFLAGS $C_EXTRA_FLAGS" diff --git a/ctaocrypt/include/config.h b/ctaocrypt/include/config.h index 7146f116b..c6f16d0fb 100644 --- a/ctaocrypt/include/config.h +++ b/ctaocrypt/include/config.h @@ -61,13 +61,13 @@ #define PACKAGE_NAME "cyassl" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "cyassl 1.9.6" +#define PACKAGE_STRING "cyassl 2.0.0rc1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "cyassl" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.9.6" +#define PACKAGE_VERSION "2.0.0rc1" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ @@ -83,7 +83,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.9.6" +#define VERSION "2.0.0rc1" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 7f6b8f532..a46dd6adc 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -39,7 +39,7 @@ #include "prefix_ssl.h" #endif -#define CYASSL_VERSION "1.9.6" +#define CYASSL_VERSION "2.0.0rc1" #ifdef _WIN32 /* wincrypt.h clashes */ diff --git a/src/include.am b/src/include.am index 2749896e6..5dd4338a5 100644 --- a/src/include.am +++ b/src/include.am @@ -16,7 +16,7 @@ src_libcyassl_la_SOURCES = \ ctaocrypt/src/dsa.c ctaocrypt/src/arc4.c ctaocrypt/src/rabbit.c \ ctaocrypt/src/pwdbased.c ctaocrypt/src/logging.c \ ctaocrypt/src/cyassl_memory.c -src_libcyassl_la_LDFLAGS = -no-undefined -version-info 1:0:0 +src_libcyassl_la_LDFLAGS = -no-undefined -version-info ${CYASSL_LIBRARY_VERSION} src_libcyassl_la_CFLAGS = -DBUILDING_CYASSL EXTRA_DIST += include/*.h include/openssl/*.h include/*.rc \ ctaocrypt/include/*.h ctaocrypt/src/misc.c