Fix keyboard related issues when building with meson

Signed-off-by: Xavier Simonart <simonartxavier@gmail.com>
Change-Id: I8186703b8ea3e88f91cd929898033eafecd686aa

diff --git a/VNFs/DPPD-PROX/Makefile b/VNFs/DPPD-PROX/Makefile
index a659c03..9a675ca 100644 (file)
--- a/VNFs/DPPD-PROX/Makefile
+++ b/VNFs/DPPD-PROX/Makefile
@@ -72,7 +72,6 @@ include $(RTE_SDK)/mk/rte.vars.mk
 # binary name
 APP = prox
 CFLAGS += -DPROGRAM_NAME=\"$(APP)\"
-CFLAGS += -DCOMPILED_WITH_MAKE
 
 CFLAGS += -O2 -g
 CFLAGS += -fno-stack-protector -Wno-deprecated-declarations

diff --git a/VNFs/DPPD-PROX/input_curses.c b/VNFs/DPPD-PROX/input_curses.c
index f549f85..346b0e3 100644 (file)
--- a/VNFs/DPPD-PROX/input_curses.c
+++ b/VNFs/DPPD-PROX/input_curses.c
@@ -28,9 +28,7 @@
 #include "input_curses.h"
 #include "histedit.h"
 
-#ifdef COMPILED_WITH_MAKE
 #include "libedit_autoconf.h"
-#endif
 
 static EditLine *el;
 static History *hist;

diff --git a/VNFs/DPPD-PROX/meson.build b/VNFs/DPPD-PROX/meson.build
index 41cf655..217a967 100644 (file)
--- a/VNFs/DPPD-PROX/meson.build
+++ b/VNFs/DPPD-PROX/meson.build
@@ -100,6 +100,16 @@ if not lua_dep.found()
        error('Suitable lua version not found')
 endif
 
+has_sym_args = [
+        [ 'HAVE_LIBEDIT_EL_RFUNC_T', 'histedit.h',
+        'el_rfunc_t' ],
+]
+config = configuration_data()
+foreach arg:has_sym_args
+        config.set(arg[0], cc.has_header_symbol(arg[1], arg[2]))
+endforeach
+configure_file(output : 'libedit_autoconf.h', configuration : config)
+
 # All other dependencies
 dpdk_dep = dependency('libdpdk', required: true)
 tinfo_dep = dependency('tinfo', required: false)