summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Zajicek (work) <santiago@crfreenet.org>2018-01-02 16:59:59 +0100
committerOndrej Zajicek (work) <santiago@crfreenet.org>2018-01-02 16:59:59 +0100
commit9bd8cb7c3ca23524cb7d69ee503e24658ad2ee42 (patch)
treeaaff46b091338c95a02449d815a2d376e907e3ac
parentd493d0f180e3df1f33d344d8b28cc1743201210b (diff)
parentcce6ba4daa2e00d6e1881a831d05cdc51249b4a7 (diff)
Merge branch 'master' into int-new
-rw-r--r--configure.ac8
1 files changed, 1 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 68e68282..f73e6264 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])