bring notcurses in #43

Makefile.am

@@ -2,8 +2,7 @@ LANG=C
 LC_ALL=c
 
 AM_CFLAGS=-std=gnu11 -Wall -O2 -W -Wshadow -Wextra -fvisibility=hidden \
-    -D_FORTIFY_SOURCE=2 \
-	  $(PTHREAD_CFLAGS) $(OPENSSL_INCLUDES) $(ZFS_CFLAGS)
+    -D_FORTIFY_SOURCE=2 $(PTHREAD_CFLAGS) $(OPENSSL_INCLUDES) $(ZFS_CFLAGS)
 AM_LDFLAGS=-Wl,-O2,--no-undefined-version,--enable-new-dtags,--as-needed,--warn-common
 AM_CC=$(PTHREAD_CC)
 
@@ -45,10 +44,11 @@ common_SOURCES=src/growlight.c src/growlight.h src/mbr.c src/mbr.h \
 
 growlight_SOURCES=$(common_SOURCES)
 growlight_SOURCES+=src/ncurses.c src/ncurses.h src/ui-aggregate.h src/ui-aggregate.c
-growlight_LDADD=@notcurses_LIBS@ @outcurses_LIBS@
+growlight_LDADD=@notcurses_LIBS@ @outcurses_LIBS@ @CURSES_LIBS@ @PANEL_LIBS@
 
 growlight_readline_SOURCES=$(common_SOURCES)
 growlight_readline_SOURCES+=src/readline.c
+# we need @CURSES_LIBS@ due to explicit use of tigetstr()
 growlight_readline_LDADD=@outcurses_LIBS@ @CURSES_LIBS@
 
 growlight_test_SOURCES=$(common_SOURCES)

configure.ac

@@ -45,8 +45,8 @@ PKG_PROG_PKG_CONFIG
 
 if test "x$zfs" = "xtrue" ; then
   PKG_CHECK_MODULES([ZFS], [libzfs], [AC_DEFINE([HAVE_ZFS], [1], [Use libzfs from ZoL])])
-	#CFLAGS+=" $ZFS_CFLAGS"
-	LFLAGS+=" $ZFS_LIBS"
+  ZFS_CFLAGS+=" $ZFS_CFLAGS"
+	ZFS_LFLAGS+=" $ZFS_LIBS"
 fi
 
 # FIXME what about the --without-ncurses/--without-ncursesw cases?
@@ -77,12 +77,12 @@ AC_CHECK_LIB(pci, pci_get_dev, [have_libpci=yes],
 	LIBS+=" -lpci"
 
 PKG_CHECK_MODULES([notcurses], [notcurses >= 0.4.0])
-	CFLAGS+=" $notcurses_CFLAGS"
-	LIBS+=" -lnotcurses_LIBS"
+	notcurses_CFLAGS+=" $notcurses_CFLAGS"
+	notcurses_LIBS+=" $notcurses_LIBS"
 
 PKG_CHECK_MODULES([outcurses], [outcurses >= 0.0.7])
-	CFLAGS+=" $outcurses_CFLAGS"
-	LIBS+=" -loutcurses_LIBS"
+	CURSES_CFLAGS+=" $outcurses_CFLAGS"
+	CURSES_LIBS+=" $outcurses_LIBS"
 
 PKG_CHECK_MODULES([libatasmart], [libatasmart >= 0.19], [AC_DEFINE([HAVE_ATASMART], [1], [Use libatasmart])])
 	CFLAGS+=" $libatasmart_CFLAGS"