From cfe267835813b684b9c8ef81b096c2c25263f544 Mon Sep 17 00:00:00 2001
From: Benjamin Franzke <benjaminfranzke@gmail.com>
Date: Wed, 12 Feb 2020 21:39:42 +0100
Subject: Use pkg-config for ncursesw, fallback to classic curses

The fallback is intended for non-ncurses systems only.
TODO: add proper check that the fallback lib is wide
character capable. (Can't add right now, as we don't
know about an incompatiblity)
---
 src/Makefile.am | 2 +-
 src/interface.c | 4 +++-
 src/interface.h | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 3579dc0..8c5071c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ pa_sink_ctl_SOURCES += unix_signal.c
 endif
 
 AM_CFLAGS = $(GCC_CFLAGS)
-AM_CPPFLAGS = $(PULSE_CFLAGS) $(PULSE_MAINLOOP_CFLAGS) $(GLIB_CFLAGS) \
+AM_CPPFLAGS = $(PULSE_CFLAGS) $(PULSE_MAINLOOP_CFLAGS) $(GLIB_CFLAGS) $(CURSES_CFLAGS) \
 	      -include $(top_builddir)/config.h
 pa_sink_ctl_LDADD = $(GLIB_LIBS) $(PULSE_LIBS) $(PULSE_MAINLOOP_LIBS) $(CURSES_LIBS)
 
diff --git a/src/interface.c b/src/interface.c
index 4fdc09f..7c37611 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -17,7 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 700
+#endif
 
 #include <unistd.h>
 #include <string.h>
@@ -27,7 +29,7 @@
 
 #include <glib.h>
 #include <pulse/pulseaudio.h>
-#include <ncurses.h>
+#include <curses.h>
 
 #include "interface.h"
 #include "ctl.h"
diff --git a/src/interface.h b/src/interface.h
index b696526..2ecc6cd 100644
--- a/src/interface.h
+++ b/src/interface.h
@@ -20,11 +20,13 @@
 #ifndef INTERFACE_H
 #define INTERFACE_H
 
+#ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 700
+#endif
 
 #include <glib.h>
 #include <pulse/pulseaudio.h>
-#include <ncurses.h>
+#include <curses.h>
 
 #define SELECTED_MAIN_CTL -1
 #define H_MSG_BOX 3
-- 
cgit