From 0c3eea9cacc6fe01a8dc26ee0ab624ef12b833c7 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 22 Jul 2012 16:15:39 -0500 Subject: [PATCH] nconf: fix build where ncurses headers are in subdirectories Signed-off-by: Yaakov Selkowitz Message-Id: <543a2e61be6d914d8b59.1342991852@YAAKOV04> --- configure.ac | 5 +++++ frontends/nconf/Makefile.am | 1 + 2 files changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac index a276f49..895cd58 100644 --- 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 a6367d2..32096ab 100644 --- 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) -- 2.39.5