[patch] moc-2.6_alpha1-detect-tinfo.patch

moc-2.6_alpha1-detect-tinfo.patch (text/plain), 1.43 KB, created by Quentin Minster on 2015-11-21 10:18:31 UTC

diff -u a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in	2015-11-20 09:38:51 
@@ -349,7 +349,7 @@
 		AC_DEFINE([HAVE_SET_ESCDELAY], 1, [Define if you have set_escdelay.]),
 		[AC_CHECK_FUNC([setenv], ,
 			AC_MSG_ERROR([Required function setenv not found.]))])
+	EXTRA_LIBS="$EXTRA_LIBS -l$CURSES_LIB $TINFO_LIBS"
-	EXTRA_LIBS="$EXTRA_LIBS -l$CURSES_LIB"
 fi
 
 dnl popt
diff -u a/m4/mp_with_curses.m4 b/m4/mp_with_curses.m4
--- a/m4/mp_with_curses.m4
+++ b/m4/mp_with_curses.m4	2015-11-20 09:38:24 
@@ -24,6 +24,7 @@
    	[Don't use ncursesw (UTF-8 support)])],,)
 
    CURSES_LIB=""
+   TINFO_LIBS=""
 
    if test "$with_ncursesw" != "no"
    then
@@ -40,6 +41,11 @@
 	     AC_DEFINE(HAVE_NCURSES_H, 1, [Define if you have ncursesw/curses.h])
 	     AC_DEFINE(HAVE_NCURSESW, 1, [Define if you have libncursesw])
 	     CURSES_LIB="ncursesw"
+         AC_CHECK_FUNC([cbreak],
+           [],
+           [AC_CHECK_LIB([tinfow], [cbreak],
+              [TINFO_LIBS="-ltinfow"],
+              [AC_MSG_ERROR([Required function cbreak not found.])])])
 	   fi
    fi
 
@@ -69,7 +75,13 @@
      then
        AC_DEFINE(HAVE_NCURSES_H, 1, [Define if you have ncurses.h])
        CURSES_LIB="ncurses"
+       AC_CHECK_FUNC([cbreak],
+         [],
+         [AC_CHECK_LIB([tinfo], [cbreak],
+            [TINFO_LIBS="-ltinfo"],
+            [AC_MSG_ERROR([Required function cbreak not found.])])])
      fi
    fi
+
    LIBS="$mp_save_LIBS"
 ])dnl