summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-08-28 15:09:12 +0200
committerJustin Lecher <jlec@gentoo.org>2015-08-28 15:09:16 +0200
commita9b630af663e3f3b932303b6853478d9b094d325 (patch)
tree3023edeb68de26d393ae5373cc705bc9945f6534 /app-shells
parentapp-shells/hstr: Add shell-tools herd and myself to metadata.xml. (diff)
downloadgentoo-a9b630af663e3f3b932303b6853478d9b094d325.tar.gz
gentoo-a9b630af663e3f3b932303b6853478d9b094d325.tar.bz2
gentoo-a9b630af663e3f3b932303b6853478d9b094d325.zip
app-shells/hstr: Update patch to first detect ncursesw
Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'app-shells')
-rw-r--r--app-shells/hstr/files/hstr-1.17-tinfo.patch35
1 files 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 5c9ea9bab4c..0ffbd0cff25 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.