gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

app-shells/hstr: fix ncurses configure.

Browse Source 
Patch courtesy of Dan Goodliffe <gentoo@randomdan.homeip.net>.

Closes: https://bugs.gentoo.org/690232
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
This commit is contained in:
Patrice Clement
2019-11-28 23:00:48 +01:00
parent 653b06d5eb
commit 50942d513f
2 changed files with 83 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
app-shells/hstr/files/hstr-2.0-fix-ncurses-configure.patch Normal file
View File

@@ -0,0 +1,81 @@
diff --git a/configure.ac b/configure.ac
index 1676ec8..73c8be5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,39 +47,33 @@ then
fi
# PKG_CHECK_MODULES macro is NOT used to avoid confusing syntax errors in case that pkg-config is NOT installed
-AC_CHECK_LIB(ncursesw, killwchar, [],
-[
- AC_CHECK_LIB(ncurses, killwchar, [],
- [
- AC_SUBST([NCURSESW_CFLAGS])
- AC_SUBST([NCURSESW_LIBS])
- if pkg-config --exists ncursesw
- then
- AC_MSG_NOTICE([Module ncursesw found])
- NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
- NCURSESW_LIBS=`pkg-config --libs ncursesw`
- else
- if pkg-config --exists ncurses
- then
- AC_MSG_NOTICE([Module ncurses found])
- NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
- NCURSESW_LIBS=`pkg-config --libs ncurses`
- else
- 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)
- ]
- )
- fi
- fi
- ]) # FAIL of ncurses
-]) # FAIL of ncursesw
+AC_SUBST([NCURSESW_CFLAGS])
+AC_SUBST([NCURSESW_LIBS])
+if pkg-config --exists ncursesw
+then
+ AC_MSG_NOTICE([Module ncursesw found])
+ NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
+ NCURSESW_LIBS=`pkg-config --libs ncursesw`
+else
+ if pkg-config --exists ncurses
+ then
+ AC_MSG_NOTICE([Module ncurses found])
+ NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
+ NCURSESW_LIBS=`pkg-config --libs ncurses`
+ else
+ 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)
+ ]
+ )
+ fi
+fi
# Checks for libraries.
diff --git a/src/Makefile.am b/src/Makefile.am
index 7640d21..17a82b7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,4 +37,4 @@ hstr_SOURCES = \
install-exec-hook:
ln $(DESTDIR)$(bindir)/hstr$(EXEEXT) $(DESTDIR)$(bindir)/hh$(EXEEXT)
-hstr_LDADD = $(NCURSES_LIBS)
+hstr_LDADD = $(NCURSESW_LIBS)

2
app-shells/hstr/hstr-2.0.ebuild
View File

@@ -22,6 +22,8 @@ DEPEND="
DOCS=( CONFIGURATION.md README.md )
PATCHES=( ${FILESDIR}/${P}-fix-ncurses-configure.patch )
src_prepare() {
default
sed \