diff options
| author | Cyril Bur <cyrilbur@gmail.com> | 2017-11-16 14:49:13 +1100 |
|---|---|---|
| committer | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2017-11-21 14:23:05 +1100 |
| commit | 117a75f95ec31c2f9ea5e560c0355a2125b09b71 (patch) | |
| tree | 285cf8c3d6ff1adf913c4100f3ac070670ccdf3a /m4 | |
| parent | 817e6698bcbbc20e186185a1d64f3a3087a65862 (diff) | |
| download | talos-petitboot-117a75f95ec31c2f9ea5e560c0355a2125b09b71.tar.gz talos-petitboot-117a75f95ec31c2f9ea5e560c0355a2125b09b71.zip | |
Better recognition of ncurses header files
This patch was lifted directly from:
https://github.com/Tlf/tlf/commit/a21513254ce8bf66d0b019f6075eea918958741a
The commit message reads:
If ax_with_ncurses finds a ncursesw instance the former code checks
only for <ncursesw/panelh>. If not there the search fails.
That let to problems at least in Arch Linux which has only <panel.h>
installed.
The patched version here checks first for <ncursesw/panel.h> and if
not found also for <panel.h>.
Tested for the following distributions:
Gentoo, Debian 7..9, Linux Mint 17 and 18.1, Arch Linux, Ubuntu
ARCH Linux builds ncurses with wide character support but does not add
any ncurses specific headers. nurses its self (by default) adds almost
no ncurses specific headers. No {prefix}/include/ncurses directory. In
fact the only ncurses specific file is the ncurses.h symlink to
curses.h, other than that there are no ncurses headers.
The ax_with_curses.m4 script detects if the installed ncurses has wide
character support. It checks using code snippets against all possible
ncurses header files.
If the ax_with_curses.m4 script detects wide character support the
ax_with_curses_extra.m4 will only look for extra curses features (in
the case of petitboot, form.h and menu.h) inside the
{prefix}/include/ncurses directory, when they could simply be in
{prefix}/include.
Signed-off-by: Cyril Bur <cyrilbur@gmail.com>
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ax_with_curses_extra.m4 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/m4/ax_with_curses_extra.m4 b/m4/ax_with_curses_extra.m4 index e0de4a6..48e3103 100644 --- a/m4/ax_with_curses_extra.m4 +++ b/m4/ax_with_curses_extra.m4 @@ -200,6 +200,11 @@ AC_DEFUN([_AX_WITH_CURSES_EXTRA], [ ], [ AS_IF([test "x$ax_cv_curses_which" = xncursesw], [ _AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [ncursesw/$4], [$5]) + dnl This fixes a problem building on distros with 'odd' + dnl ncurses header file setups + AS_IF([test x$[]ax_cv_[]m4_tolower($1) != "xyes"], [ + _AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [$4], [$5]) + ]) ], [test "x$ax_cv_curses_which" = xncurses], [ _AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [ncurses/$4], [$6]) _AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [$4], [$6]) |
