diff --git a/compiler2/Makefile b/compiler2/Makefile index d00ff26bdb63eb779b44405c35645452b0efe5d1..28190b3d33e8f87cb06a8e3729b505d07aa368f2 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 f00d8ab444f6f87ad8208866a96e16582c20df97..93d7c465ee259723f3d7e84930329b9956aef0f0 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;