From 56f426ae9e39a925ea58a63c571612dc736c75dd Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Tue, 8 Dec 2015 20:57:49 +0100
Subject: [PATCH] client: New configure --with-readline

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
---
 configure.ac            |  3 ++-
 m4/my_lib_readline.m4   | 15 +++++++++++++++
 src/client/configure.ac |  3 ++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index c0816116f..7e56c02af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,7 @@ LIBS_util="$LIBS"
 LIBS="$LIBS_SOCKETS $LIBS"
 AX_LIB_SOCKET_NSL
 LIBS_server="$LIBS"
-MY_LIB_READLINE
+MY_WITH_READLINE
 
 
 ### Checks for header files
@@ -235,6 +235,7 @@ AC_OUTPUT
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([-= Configuration summary =-])
 AC_MSG_NOTICE([Thread package: $empthread])
+AC_MSG_NOTICE([      readline: $with_readline])
 AC_MSG_NOTICE([      terminfo: $with_terminfo])
 AC_MSG_NOTICE([    EMPIREHOST: $EMPIREHOST])
 AC_MSG_NOTICE([    EMPIREPORT: $EMPIREPORT])
diff --git a/m4/my_lib_readline.m4 b/m4/my_lib_readline.m4
index 5d570e5eb..37fedec56 100644
--- a/m4/my_lib_readline.m4
+++ b/m4/my_lib_readline.m4
@@ -23,3 +23,18 @@ AC_DEFUN([MY_LIB_READLINE], [
 		  [Define if you have libreadline])
     fi
 ])
+
+AC_DEFUN([MY_WITH_READLINE],
+[
+  AC_ARG_WITH([readline],
+    [AS_HELP_STRING([--with-readline],
+      [support fancy command line editing @<:@default=check@:>@])],
+    [],
+    [with_readline=check])
+  if test "x$with_readline" != xno; then
+      MY_LIB_READLINE
+      if test "x$have_readline$with_readline" = xnoyes; then
+	  AC_MSG_FAILURE([--with-readline was given, but test for readline failed])
+      fi
+      with_readline="$have_readline"
+  fi])
diff --git a/src/client/configure.ac b/src/client/configure.ac
index 90cc518ea..2baebcad0 100644
--- a/src/client/configure.ac
+++ b/src/client/configure.ac
@@ -58,7 +58,7 @@ if test "$Windows_API" = yes; then
 	AC_LIBOBJ([w32/w32io])
 	AC_LIBOBJ([w32/w32sockets])
 fi
-MY_LIB_READLINE
+MY_WITH_READLINE
 
 
 ### Checks for header files.
@@ -94,6 +94,7 @@ AC_OUTPUT
 
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([-= Configuration summary =-])
+AC_MSG_NOTICE([      readline: $with_readline])
 AC_MSG_NOTICE([      terminfo: $with_terminfo])
 AC_MSG_NOTICE([    EMPIREHOST: $EMPIREHOST])
 AC_MSG_NOTICE([    EMPIREPORT: $EMPIREPORT])
-- 
2.43.0