From: Johnathan Jenkins <john@nixheads.co.uk>
Date: Sat, 13 May 2017 16:33:08 +0000 (-0700)
Subject: pkg-config for ncurses (#25)
X-Git-Tag: v1.2~64
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=9eed24bbac968f85d40d6d2d9b05e834a6ab6614;p=nnn.git

pkg-config for ncurses (#25)
---

diff --git a/Makefile b/Makefile
index 69e19e3e..efd9555a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,15 @@ MANPREFIX = $(PREFIX)/share/man
 
 CFLAGS += -O3 -march=native -Wall -Wextra -Wno-unused-parameter
 LDLIBS = -lreadline
-ifeq ($(shell uname), Darwin)
-    LDLIBS += -lncurses
+
+ifeq ($(shell pkg-config ncursesw && echo 1),1)
+	CFLAGS += $(shell pkg-config --cflags ncursesw)
+	LDLIBS += $(shell pkg-config --libs   ncursesw)
 else
-    LDLIBS += -lncursesw
+	LDLIBS += -lncurses
 endif
 
+
 DISTFILES = nlay nnn.c config.def.h nnn.1 Makefile README.md LICENSE
 LOCALCONFIG = config.h
 SRC = nnn.c
diff --git a/nnn.c b/nnn.c
index cedaff19..1bd9a670 100644
--- a/nnn.c
+++ b/nnn.c
@@ -6,11 +6,7 @@
 #include <sys/resource.h>
 
 #include <ctype.h>
-#ifdef __linux__
-#include <ncursesw/curses.h>
-#else
 #include <curses.h>
-#endif
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>