diff options
| author | Jesper Dangaard Brouer <brouer@redhat.com> | 2013-12-18 22:01:05 +0100 |
|---|---|---|
| committer | Jesper Dangaard Brouer <brouer@redhat.com> | 2013-12-18 22:01:05 +0100 |
| commit | eee6fb6e175287e2285ab47783fdab44c1530eb1 (patch) | |
| tree | 4b05efc19d5cd42dd413cbaf9c5c63f3c71d340e | |
| parent | 209082307bd1595f68dbd328bacf8aec7536c441 (diff) | |
debian: compile fix for programs using ncurses
For some reason the Debian ncurses version does not
contain a ncurses.pc pkg-config file.
Fix this by echoing "-lncurses" if the command fails:
pkg-config --libs ncurses
This fix will make ifpps compile on Debian Squeeze 6.0.8.
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | flowtop/Makefile | 5 | ||||
| -rw-r--r-- | ifpps/Makefile | 7 |
3 files changed, 9 insertions, 6 deletions
@@ -259,7 +259,8 @@ EOF $CC \ $(pkg-config --cflags ncurses 2>> config.log) \ -o $TMPDIR/ncursestest $TMPDIR/ncursestest.c \ - $(pkg-config --libs ncurses 2>> config.log) \ + $(pkg-config --libs ncurses 2>> config.log \ + || echo '-lncurses' ) \ >> config.log 2>&1 if [ ! -x $TMPDIR/ncursestest ] ; then echo "[NO]" diff --git a/flowtop/Makefile b/flowtop/Makefile index b668726..12f8d61 100644 --- a/flowtop/Makefile +++ b/flowtop/Makefile @@ -1,8 +1,9 @@ flowtop-libs = -lGeoIP \ -lurcu \ -lnetfilter_conntrack \ - $(shell pkg-config --libs ncurses) \ - $(shell pkg-config --libs tinfo) \ + $(shell pkg-config --libs ncurses 2> /dev/null \ + || echo '-lncurses') \ + $(shell pkg-config --libs tinfo 2> /dev/null ) \ -lpthread \ -lz diff --git a/ifpps/Makefile b/ifpps/Makefile index e095d27..4d1a9b6 100644 --- a/ifpps/Makefile +++ b/ifpps/Makefile @@ -1,5 +1,6 @@ -ifpps-libs = $(shell pkg-config --libs ncurses) \ - $(shell pkg-config --libs tinfo) +ifpps-libs = $(shell pkg-config --libs ncurses 2> /dev/null \ + || echo '-lncurses') \ + $(shell pkg-config --libs tinfo 2> /dev/null ) ifpps-objs = xmalloc.o \ ioops.o \ @@ -11,6 +12,6 @@ ifpps-objs = xmalloc.o \ screen.o \ ifpps.o -ifpps-eflags = $(shell pkg-config --cflags ncurses) +ifpps-eflags = $(shell pkg-config --cflags ncurses 2> /dev/null) ifpps-confs = |