From 497a113d40d206fb875acd413195bb7ca975fa7f Mon Sep 17 00:00:00 2001
From: Botond Baranyi <botond.baranyi@ericsson.com>
Date: Fri, 2 Oct 2020 17:07:31 +0200
Subject: [PATCH] Changed the include statement of 'readline.h', so it can be
 found on multiple platforms (Bug 565893)

Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com>
Change-Id: Iaa1f9153cfdceb40c74e01ec30a756a63d0caa52
---
 core/DebuggerUI.cc | 2 +-
 core/Makefile      | 6 +++++-
 mctr2/cli/Cli.cc   | 2 +-
 mctr2/cli/Makefile | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/DebuggerUI.cc b/core/DebuggerUI.cc
index e12e1de2e..b17699010 100644
--- a/core/DebuggerUI.cc
+++ b/core/DebuggerUI.cc
@@ -18,7 +18,7 @@
 #include <ctype.h>
 
 #ifdef ADVANCED_DEBUGGER_UI
-#include <editline/readline.h>
+#include <readline.h>
 // use a different file, than the MCTR CLI, since not all commands are the same
 #define TTCN3_HISTORY_FILENAME ".ttcn3_history_single"
 #endif
diff --git a/core/Makefile b/core/Makefile
index e6db442d3..8cacb359c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -87,7 +87,7 @@ ifeq ($(ADVANCED_DEBUGGER_UI), yes)
   SOLARIS8_LIBS  += -lcurses -lbsd -ledit
   LINUX_LIBS     += -lncurses -lbsd -ledit
   FREEBSD_LIBS   += -lncurses -lbsd -ledit
-  WIN32_LIBS     += -lncurses -lbsd -ledit
+  WIN32_LIBS     += -lncurses -ledit
   INTERIX_LIBS   += -lncurses -lbsd -ledit
 endif
 
@@ -151,6 +151,10 @@ ifeq ($(PLATFORM),INTERIX)
   CPPFLAGS += -I/usr/local/include
 endif
 
+ifeq ($(ADVANCED_DEBUGGER_UI), yes)
+  CPPFLAGS += -I/usr/include/editline -I/usr/include/readline
+endif
+
 
 OBJECTS := $(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(SOURCES)))
 	
diff --git a/mctr2/cli/Cli.cc b/mctr2/cli/Cli.cc
index c88388adf..85088e8bf 100644
--- a/mctr2/cli/Cli.cc
+++ b/mctr2/cli/Cli.cc
@@ -31,7 +31,7 @@
 #include "../mctr/MainController.h"
 
 #include <stdio.h>
-#include <editline/readline.h>
+#include <readline.h>
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
diff --git a/mctr2/cli/Makefile b/mctr2/cli/Makefile
index 5ef23033f..ae27deb7c 100644
--- a/mctr2/cli/Makefile
+++ b/mctr2/cli/Makefile
@@ -40,7 +40,7 @@ OBJECTS := $(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(SOURCES)))
 
 DEPFILES := $(patsubst %.cc,%.d,$(patsubst %.c,%.d,$(SOURCES)))
 
-CPPFLAGS += -D_REENTRANT
+CPPFLAGS += -D_REENTRANT -I/usr/include/editline -I/usr/include/readline
 
 ifdef OPENSSL_DIR
 ifneq ($(OPENSSL_DIR), default)
-- 
GitLab