Commit 9bd8cb7c authored by Ondřej Zajíček's avatar Ondřej Zajíček

Merge branch 'master' into int-new

parents d493d0f1 cce6ba4d
Pipeline #30845 passed with stages
in 5 minutes and 46 seconds
......@@ -366,12 +366,6 @@ if test "$enable_client" = yes ; then
[$TINFO_LIBS]
)
AC_SEARCH_LIBS([add_history], [history readline],
[HISTORY_LIBS="$LIBS"; LIBS=""],
[AC_MSG_ERROR([The client requires GNU Readline library. Either install the library or use --disable-client to compile without the client.])],
[$TINFO_LIBS]
)
AC_CHECK_LIB([readline], [rl_crlf],
[AC_DEFINE([HAVE_RL_CRLF], [1], [Define to 1 if you have rl_crlf()])],
[],
......@@ -385,7 +379,7 @@ if test "$enable_client" = yes ; then
)
LIBS="$BASE_LIBS"
CLIENT_LIBS="$HISTORY_LIBS $READLINE_LIBS $TINFO_LIBS"
CLIENT_LIBS="$READLINE_LIBS $TINFO_LIBS"
fi
AC_SUBST([CLIENT])
AC_SUBST([CLIENT_LIBS])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment