summaryrefslogtreecommitdiff
blob: b0eb94cbcd8e02043e53d43434b87217c5b175a1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
--- a/m4/ax_ncurses.m4
+++ b/m4/ax_ncurses.m4
@@ -12,24 +12,31 @@
 
   AS_IF([test "x$with_ncurses" != "xno"], [
     AC_CACHE_CHECK([for working ncurses], mp_cv_ncurses, [
-      LIBS="$mp_save_LIBS $SAIDARLIBS -lncurses"
+      LIBS="$mp_save_LIBS $SAIDARLIBS -lncurses -ltinfo"
       CPPFLAGS="$mp_save_CPPFLAGS $SAIDARCPPFLAGS"
       AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ncurses.h>], [testcode])], [
         mp_cv_ncurses="ncurses.h"
-        CURSES_LIB="-lncurses"
+        CURSES_LIB="-lncurses -ltinfo"
       ], [
         LIBS="$mp_save_LIBS $SAIDARLIBS -lncurses"
         CPPFLAGS="$mp_save_CPPFLAGS $SAIDARCPPFLAGS"
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ncurses/ncurses.h>], [testcode])], [
-          mp_cv_ncurses="ncurses/ncurses.h"
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ncurses.h>], [testcode])], [
+          mp_cv_ncurses="ncurses.h"
           CURSES_LIB="-lncurses"
         ], [
-          LIBS="$mp_save_LIBS $SAIDARLIBS -lcurses"
+          LIBS="$mp_save_LIBS $SAIDARLIBS -lncurses"
           CPPFLAGS="$mp_save_CPPFLAGS $SAIDARCPPFLAGS"
-          AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <curses.h>], [testcode])], [
-            mp_cv_ncurses="curses.h"
-            CURSES_LIB="-lcurses"
-          ], [mp_cv_ncurses=no])
+          AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ncurses/ncurses.h>], [testcode])], [
+            mp_cv_ncurses="ncurses/ncurses.h"
+            CURSES_LIB="-lncurses"
+          ], [
+            LIBS="$mp_save_LIBS $SAIDARLIBS -lcurses"
+            CPPFLAGS="$mp_save_CPPFLAGS $SAIDARCPPFLAGS"
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <curses.h>], [testcode])], [
+              mp_cv_ncurses="curses.h"
+              CURSES_LIB="-lcurses"
+            ], [mp_cv_ncurses=no])
+          ])
         ])
       ])
     ])