From 9d34e45b715dd59fed202c6aeed2838f1023897f Mon Sep 17 00:00:00 2001 From: Todd A Ouska Date: Wed, 24 Aug 2011 16:23:27 -0700 Subject: [PATCH] remove automatic version generated file use since embedded, windows, and project builds won't have available, can turn on in settings --- cyassl/ctaocrypt/ctc_settings.h | 3 +++ cyassl/openssl/ssl.h | 12 +++++++++--- cyassl/version.h.in | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/cyassl/ctaocrypt/ctc_settings.h b/cyassl/ctaocrypt/ctc_settings.h index 56c71b724..c73f264ef 100644 --- a/cyassl/ctaocrypt/ctc_settings.h +++ b/cyassl/ctaocrypt/ctc_settings.h @@ -51,6 +51,9 @@ /* Uncomment next line if building CyaSSL for a game console */ /* #define CYASSL_GAME_BUILD */ +/* Uncomment next line if builing yaSSL with autoconf and want version string */ +/* #define USE_CYASSL_VERSION */ + #include #ifdef IPHONE diff --git a/cyassl/openssl/ssl.h b/cyassl/openssl/ssl.h index 815b3a8f5..cd9610a9b 100644 --- a/cyassl/openssl/ssl.h +++ b/cyassl/openssl/ssl.h @@ -28,8 +28,12 @@ #ifndef CYASSL_OPENSSL_H_ #define CYASSL_OPENSSL_H_ -#include /* for users not using preprocessor flags */ -#include +/* for users not using preprocessor flags */ +#include + +#ifdef USE_CYASSL_VERSION + #include +#endif #ifndef NO_FILESYSTEM #include /* ERR_print fp */ @@ -39,7 +43,9 @@ #include "prefix_ssl.h" #endif -#define CYASSL_VERSION LIBCYASSL_VERSION_STRING +#ifdef LIBCYASSL_VERSION_STRING + #define CYASSL_VERSION LIBCYASSL_VERSION_STRING +#endif #ifdef _WIN32 /* wincrypt.h clashes */ diff --git a/cyassl/version.h.in b/cyassl/version.h.in index 2b3605cc7..979a5b6aa 100644 --- a/cyassl/version.h.in +++ b/cyassl/version.h.in @@ -1,4 +1,4 @@ -/* cyassl_error.h +/* cyassl_version.h * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. *