nconf: fix build where ncurses headers are in subdirectories

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Message-Id: <543a2e61be6d914d8b59.1342991852@YAAKOV04>

diff --git a/configure.ac b/configure.ac
index a276f49e438da98e31cd6ab1df2e844b5749a0a3..895cd58cf9f76ebbe9beb5832ded31cd38ac0315 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -301,6 +301,11 @@ AS_IF(
 AS_IF(
     [test "$need_panel_menu" = "yes" -o "$need_panel_menu" = "auto"],
     [AC_SUBST([ncurses_extra_LIBS])
+     AC_SUBST([ncurses_extra_CPPFLAGS])
+     AS_CASE(
+        [$CURSES_LOC],
+        [ncursesw/*],[ncurses_extra_CPPFLAGS="-I/usr/include/ncursesw"],
+        [ncurses/*],[ncurses_extra_CPPFLAGS="-I/usr/include/ncurses"])
      LIBS_old="$LIBS"
      LIBS=
      AC_SEARCH_LIBS(

diff --git a/frontends/nconf/Makefile.am b/frontends/nconf/Makefile.am
index a6367d2ace7791a2d70e0cc0735be56ea02721de..32096ab37de16e578362523ad1bee75da1604330 100644 (file)
--- a/frontends/nconf/Makefile.am
+++ b/frontends/nconf/Makefile.am
@@ -3,6 +3,7 @@ bin_PROGRAMS = nconf
 nconf_SOURCES = nconf.c nconf.gui.c nconf.h
 nconf_CPPFLAGS = $(AM_CPPFLAGS)     \
                  $(intl_CPPFLAGS)   \
+                 $(ncurses_extra_CPPFLAGS) \
                  -I$(top_srcdir)/libs/parser
 nconf_CFLAGS = $(AM_CFLAGS) \
                $(kf_CFLAGS)