netsniff-ng/netsniff-ng-fix-ncurses.diff

40 lines
1.3 KiB
Diff
Raw Normal View History

diff --git a/configure b/configure
index d5fe7e6..56148ac 100755
--- a/configure
+++ b/configure
@@ -428,9 +428,9 @@ int main(void)
EOF
$CC \
- $($PKG_CONFIG --cflags ncurses 2>> config.log) \
+ $(ncurses5-config --cflags 2>> config.log) \
-o $TMPDIR/ncursestest $TMPDIR/ncursestest.c \
- $($PKG_CONFIG --libs ncurses 2>> config.log \
+ $(ncurses5-config --libs 2>> config.log \
|| echo '-lncurses' ) \
>> config.log 2>&1
if [ ! -x $TMPDIR/ncursestest ] ; then
diff --git a/flowtop/Makefile b/flowtop/Makefile
index e001ce8..bffd86e 100644
--- a/flowtop/Makefile
+++ b/flowtop/Makefile
@@ -1,8 +1,7 @@
flowtop-libs = -lurcu \
$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs libnetfilter_conntrack 2> /dev/null ) \
- $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs ncurses 2> /dev/null \
+ $(shell ncurses5-config --libs 2> /dev/null \
|| echo '-lncurses') \
- $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs tinfo 2> /dev/null ) \
-lpthread
ifeq ($(CONFIG_GEOIP), 1)
@@ -30,7 +29,7 @@ flowtop-objs += geoip.o \
ioops.o
endif
-flowtop-eflags = $(shell $(PKG_CONFIG) --cflags ncurses) \
+flowtop-eflags = $(shell ncurses5-config --cflags) \
$(shell $(PKG_CONFIG) --cflags libnetfilter_conntrack)
flowtop-confs = tcp.conf \