X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=m4%2Fcurses.m4;h=031e1eeab9fa71054753cb5e296e545102977716;hb=72136f8418bc7e8a0a5bf3c11215aa49dc679659;hp=1001f4970bb6542e52df92e62108811f6e9ce5e2;hpb=ec495b2f15fc5ae22136c226c7966caf51f643f8;p=tinc

diff --git a/m4/curses.m4 b/m4/curses.m4
index 1001f497..031e1eea 100644
--- a/m4/curses.m4
+++ b/m4/curses.m4
@@ -6,6 +6,7 @@ AC_DEFUN([tinc_CURSES],
     AS_HELP_STRING([--disable-curses], [disable curses support]))
   AS_IF([test "x$enable_curses" != "xno"], [
   AC_DEFINE(HAVE_CURSES, 1, [have curses support])
+    curses=true
     AC_ARG_WITH(curses,
       AS_HELP_STRING([--with-curses=DIR], [curses base directory, or:]),
       [curses="$withval"
@@ -30,9 +31,14 @@ AC_DEFUN([tinc_CURSES],
       [AC_MSG_ERROR("curses header files not found."); break]
     )
 
-    AC_CHECK_LIB(curses, initscr,
-      [LIBS="$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)
 ])