dvorka/hstr
1
1
Fork 0
mirror of https://github.com/dvorka/hstr.git synced 2024-12-26 09:22:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fixed build when ncurses was built with separate tinfo library

Browse source 
Gentoo-bug: https://bugs.gentoo.org/690232
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
This commit is contained in:
Lars Wendler 2019-07-24 14:52:19 +02:00
parent 6609b75110
commit 17a6c9ac97
No known key found for this signature in database
GPG key ID: 571DD2D0343C6039
1 changed files with 20 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
configure.ac
View file

@ -36,51 +36,32 @@ AC_PROG_CC
# Determine OS # Determine OS
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_CHECK_PROG(PKG_CONFIG_EXISTS,[pkg-config],[pkg-config],[no]) # Check for existence of pkg-config
if test "$PKG_CONFIG_EXISTS" = "no" PKG_PROG_PKG_CONFIG
then
AS_IF([ test -z $PKG_CONFIG ], [
# Notify user that pkg-tools are required # Notify user that pkg-tools are required
AC_MSG_NOTICE([===================================================================================]) AC_MSG_NOTICE([===================================================================================])
AC_MSG_NOTICE([IMPORTANT: Make sure you have pkg-config installed - it's needed to run this script]) AC_MSG_NOTICE([IMPORTANT: Make sure you have pkg-config installed - it's needed to run this script])
AC_MSG_NOTICE([===================================================================================]) AC_MSG_NOTICE([===================================================================================])
AC_MSG_ERROR([Please install required program 'pkg-config' and run build/tarball/tarball-automake.sh again.]) AC_MSG_ERROR([Please install required program 'pkg-config' and run build/tarball/tarball-automake.sh again.])
fi ])
# PKG_CHECK_MODULES macro is NOT used to avoid confusing syntax errors in case that pkg-config is NOT installed AS_IF([ test -n $PKG_CONFIG ], [
NCURSES_IMPL=ncurses
AS_IF([$PKG_CONFIG --exists ncursesw], [NCURSES_IMPL=ncursesw])
PKG_CHECK_MODULES([NCURSES], [$NCURSES_IMPL], ,
[AC_MSG_ERROR([Could not find ncurses library])]
)
], [
AC_CHECK_LIB(ncursesw, killwchar, [], AC_CHECK_LIB(ncursesw, killwchar, [],
[ [
AC_CHECK_LIB(ncurses, killwchar, [], AC_CHECK_LIB(ncurses, killwchar, [],
[ [AC_MSG_ERROR([Could not find ncurses library])]
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
# Checks for libraries. # Checks for libraries.
AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])]) AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])