X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=m4%2Fcurses.m4;h=031e1eeab9fa71054753cb5e296e545102977716;hb=f8190b7233871b5b47c3fc8846731d1bbdef78a5;hp=408ae282424f8e6d40261e084b83e883d9c5a7fb;hpb=33f241d97852d7a171f1aaf1bda7f66356ff889e;p=tinc

diff --git a/m4/curses.m4 b/m4/curses.m4
index 408ae282..031e1eea 100644
--- a/m4/curses.m4
+++ b/m4/curses.m4
@@ -31,12 +31,14 @@ AC_DEFUN([tinc_CURSES],
       [AC_MSG_ERROR("curses header files not found."); break]
     )
 
-    AC_CHECK_LIB(curses, initscr,
-      [CURSES_LIBS="-lcurses"],
-      [AC_MSG_ERROR("curses libraries not found.")]
+    AC_CHECK_LIB(ncurses, initscr,
+      [CURSES_LIBS="-lncurses"; AC_CHECK_LIB(tinfo, wtimeout, [CURSES_LIBS+=" -ltinfo"], [])],
+      [AC_CHECK_LIB(curses, initscr,
+        [CURSES_LIBS="-lcurses"],
+        [AC_MSG_ERROR("curses libraries not found.")]
+      )]
     )
   ])
 
   AC_SUBST(CURSES_LIBS)
-  AM_CONDITIONAL(CURSES, test "$curses" = true)
 ])