@@ -86,24 +86,6 @@ AC_SEARCH_LIBS(backtrace, execinfo)
8686AC_SEARCH_LIBS ( uc_width , unistring , [ ] , [ AC_MSG_ERROR ( [ libunistring required to build] ) ] )
8787LIBCURL_CHECK_CONFIG([ ] , [ 7.23.0] , [ ] , [ AC_MSG_ERROR ( [ libcurl required to build] ) ] , [ test x"${enable_static}" = x"yes"] )
8888
89- # Sometimes, curses depends on these libraries being linked in...
90- AC_ARG_ENABLE ( [ tinfo] ,
91- AS_HELP_STRING ( [ --disable-tinfo] ,
92- [ Disable linking with tinfo, enabled by default] ) ,
93- [ ] , [ enable_tinfo="yes"]
94- )
95-
96- AS_IF ( [ test "x${enable_tinfo}" != "xno"] ,
97- [ dnl
98- AC_MSG_NOTICE ( [ Trying to link with tinfo] )
99- AC_SEARCH_LIBS ( cur_term , [ tinfow tinfo] ,
100- AC_MSG_NOTICE ( [ Linking with tinfo] ) ,
101- AC_MSG_WARN ( [ libtinfo not found] )
102- )
103- ] ,
104- AC_MSG_NOTICE ( [ Building with tinfo linking disabled] )
105- )
106-
10789dnl libgpm is required on some systems where there is a misconfigured ncurses
10890dnl and gpm libraries with interdependencies. This check is not required on OS X.
10991AS_CASE ( [ "$host_os"] ,
@@ -145,12 +127,6 @@ AS_IF([test "x$with_system_doctest" != "xyes"], [
145127
146128LNAV_WITH_JEMALLOC
147129
148- AX_WITH_CURSES
149-
150- AS_VAR_IF ( [ ax_cv_curses] ,[ yes] ,[ ] ,
151- AC_MSG_ERROR ( [ requires an X/Open-compatible Curses library with color] ) dnl
152- )
153-
154130AX_PATH_LIB_ARCHIVE
155131AX_CHECK_PCRE2([ 8] , [ ] , [ AC_MSG_ERROR ( [ pcre2 is required to build] ) ] )
156132
@@ -201,9 +177,9 @@ AC_DEFINE([_XOPEN_SOURCE_EXTENDED], [1], [Wide character support for ncurses])
201177AS_VAR_SET ( ALL_LDFLAGS , "$SQLITE3_LDFLAGS $LIBARCHIVE_LDFLAGS $LIBCURL $LDFLAGS" )
202178
203179AS_VAR_SET ( static_lib_list ,
204- [ "libncurses.a libncursesw.a libsqlite3.a libz.a libtinfo.a libtinfow .a"] )
180+ [ "libsqlite3.a libz.a"] )
205181AS_VAR_SET ( static_lib_list ,
206- [ "$static_lib_list libpcre2-8.a libncursesw.a libbz2.a"] )
182+ [ "$static_lib_list libpcre2-8.a libbz2.a"] )
207183AS_VAR_SET ( static_lib_list ,
208184 [ "$static_lib_list libgpm.a libcurl.a libcrypto.a libssl.a libssh2.a"] )
209185AS_VAR_SET ( static_lib_list ,
0 commit comments