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

Merge branch 'master' of https://github.com/jlec/hstr into jlec-master

Browse source 
Conflicts:
	src/Makefile.am
This commit is contained in:
Martin Dvorak 2015-09-17 06:53:04 +02:00
commit 6e776ef112
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
configure.ac
View file

@ -31,17 +31,21 @@ AC_PROG_CC
# Platform specific ncurses check.
AC_CANONICAL_HOST
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)
]
)
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.
AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])

2
src/Makefile.am
View file

@ -35,3 +35,5 @@ hh_SOURCES = \
# create hh > hstr hard link on installation
install-exec-hook:
ln $(DESTDIR)$(bindir)/hh$(EXEEXT) $(DESTDIR)$(bindir)/hstr$(EXEEXT)
hh_LDADD = $(NCURSES_LIBS)