commit: a9b630af663e3f3b932303b6853478d9b094d325 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Fri Aug 28 13:09:12 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Fri Aug 28 13:09:16 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b630af
app-shells/hstr: Update patch to first detect ncursesw Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> app-shells/hstr/files/hstr-1.17-tinfo.patch | 35 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/app-shells/hstr/files/hstr-1.17-tinfo.patch b/app-shells/hstr/files/hstr-1.17-tinfo.patch index 5c9ea9b..0ffbd0c 100644 --- a/app-shells/hstr/files/hstr-1.17-tinfo.patch +++ b/app-shells/hstr/files/hstr-1.17-tinfo.patch @@ -1,25 +1,14 @@ - configure.ac | 22 ++++++++++++---------- - src/Makefile.am | 2 ++ - 2 files changed, 14 insertions(+), 10 deletions(-) - diff --git a/configure.ac b/configure.ac -index 9cf6a53..7367a32 100644 +index 9cf6a53..cbc649d 100644 --- a/configure.ac +++ b/configure.ac -@@ -18,17 +18,19 @@ AC_PROG_CC +@@ -18,17 +18,21 @@ AC_PROG_CC # Platform specific ncurses check. AC_CANONICAL_HOST -AS_CASE([$host_os], - [darwin*], -+PKG_CHECK_MODULES([NCURSES], [ncurses], [], [ -+ AS_CASE([$host_os], -+ [darwin*], -+ [ -+ AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])]) -+ AC_CHECK_HEADER(curses.h) -+ ], - [ +- [ - AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])]) - AC_CHECK_HEADER(curses.h) - ], @@ -28,10 +17,20 @@ index 9cf6a53..7367a32 100644 - AC_CHECK_HEADER(ncursesw/curses.h) - ] -) -+ AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])]) -+ AC_CHECK_HEADER(ncursesw/curses.h) -+ ] -+ ) ++PKG_CHECK_MODULES([NCURSES], [ncursesw], [], [ ++ PKG_CHECK_MODULES([NCURSES], [ncurses], [], [ ++ AS_CASE([$host_os], ++ [darwin*], ++ [ ++ AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])]) ++ AC_CHECK_HEADER(curses.h) ++ ], ++ [ ++ AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])]) ++ AC_CHECK_HEADER(ncursesw/curses.h) ++ ] ++ ) ++ ]) +]) # Checks for libraries.
