From dfeb5d793d497cd235d819b5871638d3f6d80e4a Mon Sep 17 00:00:00 2001
From: BenceJanosSzabo <bence.janos.szabo@ericsson.com>
Date: Tue, 7 Feb 2017 15:27:44 +0100
Subject: [PATCH] Openssl version printed in compiler -v regardless of
licensing
Change-Id: Ieb6c0f44f77aedae2443a64477d5daf6256f9de1
Signed-off-by: BenceJanosSzabo <bence.janos.szabo@ericsson.com>
---
compiler2/Makefile | 6 ++----
compiler2/main.cc | 13 +++++++------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/compiler2/Makefile b/compiler2/Makefile
index d00ff26bd..28190b3d3 100644
--- a/compiler2/Makefile
+++ b/compiler2/Makefile
@@ -111,10 +111,8 @@ COMMON_OBJECTS := $(addprefix ../common/, memory.o path.o userinfo.o)
TCOV2LCOV_COMMON_OBJECTS := ../common/memory.o
-ifeq ($(LICENSING), yes)
- COMMON_OBJECTS += ../common/license.o
- TCOV2LCOV_COMMON_OBJECTS += ../common/license.o
-endif
+COMMON_OBJECTS += ../common/license.o
+TCOV2LCOV_COMMON_OBJECTS += ../common/license.o
ifdef REGEX_DIR
COMMON_OBJECTS += $(REGEX_DIR)/lib/regex.o
diff --git a/compiler2/main.cc b/compiler2/main.cc
index f00d8ab44..93d7c465e 100644
--- a/compiler2/main.cc
+++ b/compiler2/main.cc
@@ -69,9 +69,9 @@
#include "ttcn3/profiler.h"
-#ifdef LICENSE
+
#include "../common/license.h"
-#endif
+
using namespace Common;
@@ -919,12 +919,13 @@ int main(int argc, char *argv[])
fputs("TTCN-3 and ASN.1 Compiler for the TTCN-3 Test Executor\n"
"Product number: " PRODUCT_NUMBER "\n"
"Build date: " __DATE__ " " __TIME__ "\n"
- "Compiled with: " C_COMPILER_VERSION "\n\n"
- COPYRIGHT_STRING "\n\n", stderr);
+ "Compiled with: " C_COMPILER_VERSION "\n", stderr);
+ fputs("Using ", stderr);
+ fputs(openssl_version_str(), stderr);
+ fputs("\n\n", stderr);
+ fputs(COPYRIGHT_STRING "\n\n", stderr);
#ifdef LICENSE
print_license_info();
- fputs("\nUsing ", stderr);
- fputs(openssl_version_str(), stderr);
fputs("\n\n", stderr);
#endif
return EXIT_SUCCESS;
--
GitLab