Openssl version printed in compiler -v regardless of licensing

Change-Id: Ieb6c0f44f77aedae2443a64477d5daf6256f9de1
Signed-off-by: BenceJanosSzabo <bence.janos.szabo@ericsson.com>

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

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;