From 8ee3089202dc5f053cef8f1e5244f3212401a667 Mon Sep 17 00:00:00 2001
From: Chris Packham <judge.packham@gmail.com>
Date: Wed, 23 Feb 2022 21:45:06 +1300
Subject: [PATCH] kconfig: Use ncurses location determined by ./configure

Prior to commit bbc4db13 ("kconfig: Sync with upstream v4.18") we used
the macros CURSES_LOC and MENU_LOC to tell us where curses.h and menu.h
were installed. Restore this behaviour so that we can deal with some of
the odd places that the curses headers end up.

Fixes #1403

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
 kconfig/lxdialog/dialog.h | 2 +-
 kconfig/nconf.h           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kconfig/lxdialog/dialog.h b/kconfig/lxdialog/dialog.h
index 68b565e3..a6f2b57e 100644
--- a/kconfig/lxdialog/dialog.h
+++ b/kconfig/lxdialog/dialog.h
@@ -16,7 +16,7 @@
 #ifdef __sun__
 #define CURS_MACROS
 #endif
-#include <ncurses.h>
+#include CURSES_LOC
 
 /*
  * Colors in ncurses 1.9.9e do not work properly since foreground and
diff --git a/kconfig/nconf.h b/kconfig/nconf.h
index fa5245eb..d41ec44a 100644
--- a/kconfig/nconf.h
+++ b/kconfig/nconf.h
@@ -13,8 +13,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <ncurses.h>
-#include <menu.h>
+#include CURSES_LOC
+#include MENU_LOC
 #include <panel.h>
 #include <form.h>