diff options
author | Geoff Levand <geoff@infradead.org> | 2013-07-19 17:07:31 -0700 |
---|---|---|
committer | Geoff Levand <geoff@infradead.org> | 2013-07-23 10:39:08 -0700 |
commit | f1599796efed1eb67759cf42f47fe4bf6a9bf93c (patch) | |
tree | 5cf13ffb598e62a45ed9830f76a74958785b2a44 /ui/ncurses/nc-menu.h | |
parent | f2747434dcdfe71c3a4d1b841070f4c9d8dc4965 (diff) | |
download | talos-petitboot-f1599796efed1eb67759cf42f47fe4bf6a9bf93c.tar.gz talos-petitboot-f1599796efed1eb67759cf42f47fe4bf6a9bf93c.zip |
configure: Update to use AX_WITH_CURSES
For a more portable build system convert to using the
autoconf-archive AX_WITH_CURSES macros. Allows building
on openSUSE, which has a different header file layout than
other distros, and fixes menu entries with UTF-8 characters;
this causes fedora installs (codename "Schrödinger´s cat")
to break the UI.
Signed-off-by: Geoff Levand <geoff@infradead.org>
Diffstat (limited to 'ui/ncurses/nc-menu.h')
-rw-r--r-- | ui/ncurses/nc-menu.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h index 750bef5..f010835 100644 --- a/ui/ncurses/nc-menu.h +++ b/ui/ncurses/nc-menu.h @@ -19,9 +19,16 @@ #if !defined(_PB_NC_MENU_H) #define _PB_NC_MENU_H -#include <assert.h> #include <linux/input.h> /* This must be included before ncurses.h */ -#include <menu.h> +#if defined HAVE_NCURSESW_MENU_H +# include <ncursesw/menu.h> +#elif defined HAVE_NCURSES_MENU_H +# include <ncurses/menu.h> +#elif defined HAVE_MENU_H +# include <menu.h> +#else +# error "Curses menu.h not found." +#endif #include "log/log.h" #include "types/types.h" |