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 | |
parent | f2747434dcdfe71c3a4d1b841070f4c9d8dc4965 (diff) | |
download | petitboot-f1599796efed1eb67759cf42f47fe4bf6a9bf93c.zip petitboot-f1599796efed1eb67759cf42f47fe4bf6a9bf93c.tar.gz |
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')
-rw-r--r-- | ui/ncurses/Makefile.am | 5 | ||||
-rw-r--r-- | ui/ncurses/generic-main.c | 4 | ||||
-rw-r--r-- | ui/ncurses/nc-boot-editor.c | 2 | ||||
-rw-r--r-- | ui/ncurses/nc-boot-editor.h | 11 | ||||
-rw-r--r-- | ui/ncurses/nc-cui.c | 2 | ||||
-rw-r--r-- | ui/ncurses/nc-menu.c | 2 | ||||
-rw-r--r-- | ui/ncurses/nc-menu.h | 11 | ||||
-rw-r--r-- | ui/ncurses/nc-scr.c | 4 | ||||
-rw-r--r-- | ui/ncurses/nc-scr.h | 14 | ||||
-rw-r--r-- | ui/ncurses/ps3-main.c | 4 |
10 files changed, 47 insertions, 12 deletions
diff --git a/ui/ncurses/Makefile.am b/ui/ncurses/Makefile.am index 6d360d2..64b6eb1 100644 --- a/ui/ncurses/Makefile.am +++ b/ui/ncurses/Makefile.am @@ -20,12 +20,11 @@ AM_CPPFLAGS = \ AM_CFLAGS = \ $(DEFAULT_CFLAGS) -AM_LDFLAGS = -lmenu -lform -lncurses - common_libs = \ libpbnc.la \ $(top_builddir)/ui/common/libpbui.la \ - $(top_builddir)/lib/libpbcore.la + $(top_builddir)/lib/libpbcore.la \ + @MENU_LIB@ @FORM_LIB@ @CURSES_LIB@ noinst_LTLIBRARIES = libpbnc.la diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c index 6280a34..cafd23a 100644 --- a/ui/ncurses/generic-main.c +++ b/ui/ncurses/generic-main.c @@ -18,11 +18,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#if defined(HAVE_CONFIG_H) #include "config.h" -#endif #define _GNU_SOURCE + +#include <assert.h> #include <errno.h> #include <getopt.h> #include <signal.h> diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c index 4579b1a..0b658f2 100644 --- a/ui/ncurses/nc-boot-editor.c +++ b/ui/ncurses/nc-boot-editor.c @@ -16,6 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #define _GNU_SOURCE #include <assert.h> diff --git a/ui/ncurses/nc-boot-editor.h b/ui/ncurses/nc-boot-editor.h index bdcc560..a509f75 100644 --- a/ui/ncurses/nc-boot-editor.h +++ b/ui/ncurses/nc-boot-editor.h @@ -19,9 +19,16 @@ #if !defined(_PB_NC_KED_H) #define _PB_NC_KED_H -#include <assert.h> #include <linux/input.h> /* This must be included before ncurses.h */ -#include <form.h> +#if defined HAVE_NCURSESW_FORM_H +# include <ncursesw/form.h> +#elif defined HAVE_NCURSES_FORM_H +# include <ncurses/form.h> +#elif defined HAVE_FORM_H +# include <form.h> +#else +# error "Curses form.h not found." +#endif #include "types/types.h" #include "ui/common/ui-system.h" diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index 3f82f85..4baaec1 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -16,6 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #define _GNU_SOURCE #include <assert.h> diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c index 0612d8a..e28168e 100644 --- a/ui/ncurses/nc-menu.c +++ b/ui/ncurses/nc-menu.c @@ -16,6 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #define _GNU_SOURCE #include <assert.h> 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" diff --git a/ui/ncurses/nc-scr.c b/ui/ncurses/nc-scr.c index 062d34a..d2455d4 100644 --- a/ui/ncurses/nc-scr.c +++ b/ui/ncurses/nc-scr.c @@ -16,6 +16,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + +#define _GNU_SOURCE + #include <assert.h> #include <stdarg.h> diff --git a/ui/ncurses/nc-scr.h b/ui/ncurses/nc-scr.h index f18753a..a8aa314 100644 --- a/ui/ncurses/nc-scr.h +++ b/ui/ncurses/nc-scr.h @@ -20,7 +20,19 @@ #define _PB_NC_SCR_H #include <linux/input.h> /* This must be included before ncurses.h */ -#include <ncurses.h> +#if defined HAVE_NCURSESW_CURSES_H +# include <ncursesw/curses.h> +#elif defined HAVE_NCURSESW_H +# include <ncursesw.h> +#elif defined HAVE_NCURSES_CURSES_H +# include <ncurses/curses.h> +#elif defined HAVE_NCURSES_H +# include <ncurses.h> +#elif defined HAVE_CURSES_H +# include <curses.h> +#else +# error "Curses header file not found." +#endif #ifdef DEBUG #define DBG(fmt, args...) pb_log("DBG: " fmt, ## args) diff --git a/ui/ncurses/ps3-main.c b/ui/ncurses/ps3-main.c index 5735055..5be8c32 100644 --- a/ui/ncurses/ps3-main.c +++ b/ui/ncurses/ps3-main.c @@ -24,11 +24,11 @@ * ncurses mouse support */ -#if defined(HAVE_CONFIG_H) #include "config.h" -#endif #define _GNU_SOURCE + +#include <assert.h> #include <errno.h> #include <getopt.h> #include <signal.h> |