From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Wed, 17 May 2017 15:03:36 +0000 (+0200)
Subject: History lib may be integrated to Readline lib
X-Git-Tag: v2.0.0~79^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dab6706abad3be5b8efd44fe860689df44d20e83;p=thirdparty%2Fbird.git

History lib may be integrated to Readline lib
---

diff --git a/configure.ac b/configure.ac
index b352e0399..5d36d8e29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -355,17 +355,18 @@ if test "$enable_client" = yes ; then
     [AC_INCLUDES_DEFAULT]
   )
 
-  AC_SEARCH_LIBS([add_history], [history],
-    [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.])],
-  )
-
   AC_SEARCH_LIBS([rl_callback_read_char], [readline],
     [READLINE_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_SEARCH_LIBS([add_history], [history],
+    [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.])],
+    [$READLINE_LIBS $TINFO_LIBS]
+  )
+
   AC_CHECK_LIB([readline], [rl_crlf],
     [AC_DEFINE([HAVE_RL_CRLF], [1], [Define to 1 if you have rl_crlf()])],
     [],
@@ -379,7 +380,7 @@ if test "$enable_client" = yes ; then
   )
 
   LIBS="$BASE_LIBS"
-  CLIENT_LIBS="$READLINE_LIBS $HISTORY_LIBS $TINFO_LIBS"
+  CLIENT_LIBS="$HISTORY_LIBS $READLINE_LIBS $TINFO_LIBS"
 fi
 AC_SUBST([CLIENT])
 AC_SUBST([CLIENT_LIBS])