Use pkg-info to detect library flags to link against ncurses

OpenLightingProject · Mar 21, 2020 · 7471f2e · 7471f2e
1 parent 79ca37d
commit 7471f2e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/configure.ac b/configure.ac
@@ -437,6 +437,9 @@ AM_CONDITIONAL([HAVE_LIBFTD2XX], [test "x$have_libftd2xx" = xyes])
 AC_CHECK_HEADERS([curses.h ncurses/curses.h])
 AC_CHECK_LIB([ncurses], [initscr], [have_ncurses="yes"])
 AM_CONDITIONAL([HAVE_NCURSES], [test "x$have_ncurses" = xyes])
+# Defines libncurses_LIBS that we can use to link against ncurses
+# Needed since >=ncurses-6 where -ltinfo is needed in addition to -lncurses
+PKG_CHECK_MODULES(libncurses, [ncurses >= 5])
 
 # pthread
 ACX_PTHREAD([

diff --git a/examples/Makefile.mk b/examples/Makefile.mk
@@ -91,9 +91,9 @@ examples_ola_uni_stats_LDADD = $(EXAMPLE_COMMON_LIBS)
 if HAVE_NCURSES
 bin_PROGRAMS += examples/ola_dmxconsole examples/ola_dmxmonitor
 examples_ola_dmxconsole_SOURCES = examples/ola-dmxconsole.cpp
-examples_ola_dmxconsole_LDADD = $(EXAMPLE_COMMON_LIBS) -lncurses
+examples_ola_dmxconsole_LDADD = $(EXAMPLE_COMMON_LIBS) $(libncurses_LIBS)
 examples_ola_dmxmonitor_SOURCES = examples/ola-dmxmonitor.cpp
-examples_ola_dmxmonitor_LDADD = $(EXAMPLE_COMMON_LIBS) -lncurses
+examples_ola_dmxmonitor_LDADD = $(EXAMPLE_COMMON_LIBS) $(libncurses_LIBS)
 endif
 
 noinst_PROGRAMS += examples/ola_throughput examples/ola_latency