diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2016-09-08 19:28:56 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2016-09-08 19:28:56 +0100 |
| commit | c6cdab1f7946dd0d7aa3caf2befa60afb11ade25 (patch) | |
| tree | dd1f9df4d596954f93e8a14c5718857d34e35a79 | |
| parent | 3ed0973493862a3720c8dd46ee6d58f3d15f2490 (diff) | |
| download | rtmux-c6cdab1f7946dd0d7aa3caf2befa60afb11ade25.tar.gz rtmux-c6cdab1f7946dd0d7aa3caf2befa60afb11ade25.tar.bz2 rtmux-c6cdab1f7946dd0d7aa3caf2befa60afb11ade25.zip | |
Use ncurses OR curses, don't mix header and library. Tested by Rob Paisley.
| -rw-r--r-- | configure.ac | 50 |
1 files changed, 33 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 773a957f..00d3a581 100644 --- a/configure.ac +++ b/configure.ac @@ -162,28 +162,44 @@ PKG_CHECK_MODULES( [ CPPFLAGS="$LIBNCURSES_CFLAGS $CPPFLAGS" LIBS="$LIBNCURSES_LIBS $LIBS" - found_curses=yes + found_ncurses=yes ], - [ - AC_SEARCH_LIBS( - setupterm, - [ncurses curses terminfo], - found_curses=yes, - found_curses=no - ) - ] + found_ncurses=no ) -AC_CHECK_HEADER( - ncurses.h, - AC_DEFINE(HAVE_NCURSES_H), +if test "x$found_ncurses" = xno; then + # pkg-config didn't work, try ncurses. + AC_CHECK_LIB( + ncurses, + setupterm, + found_ncurses=yes, + found_ncurses=no + ) AC_CHECK_HEADER( - curses.h, - AC_DEFINE(HAVE_CURSES_H), + ncurses.h, + , + found_ncurses=no) +fi +if test "x$found_ncurses" = xyes; then + LIBS="$LIBS -lncurses" + AC_DEFINE(HAVE_NCURSES_H) +else + # No ncurses, try curses. + AC_CHECK_LIB( + curses, + setupterm, + found_curses=yes, found_curses=no ) -) -if test "x$found_curses" = xno; then - AC_MSG_ERROR("curses not found") + AC_CHECK_HEADER( + curses.h, + , + found_curses=no) + if test "x$found_curses" = xyes; then + LIBS="$LIBS -lcurses" + AC_DEFINE(HAVE_CURSES_H) + else + AC_MSG_ERROR("curses or ncurses not found") + fi fi # Look for utempter. |