r15356: Remove unused 'flags' argument from socket_send() and friends.

[bbaumbach/samba-autobuild/.git] / source4 / lib / replace / readline.m4

diff --git a/source4/lib/replace/readline.m4 b/source4/lib/replace/readline.m4
index 0d1aa60d17d49d825c196e73e62240e0e8f73c36..34b538f10a559b799ca3cb141eb011832c8d4908 100644 (file)
--- a/source4/lib/replace/readline.m4
+++ b/source4/lib/replace/readline.m4
@@ -2,6 +2,7 @@
 # Readline included by default unless explicitly asked not to
 test "${with_readline+set}" != "set" && with_readline=yes
 
+EXTERNAL_READLINE=no
 # test for where we get readline() from
 AC_MSG_CHECKING(whether to use readline)
 AC_ARG_WITH(readline,
@@ -19,7 +20,7 @@ AC_ARG_WITH(readline,
       done
       AC_CHECK_LIB(readline, rl_callback_handler_install,
        [TERMLIBS="-lreadline $TERMLIBS"
-       AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline])
+       EXTERNAL_READLINE=yes
        break], [TERMLIBS=], $TERMLIBS)])
     ;;
   no)
@@ -50,7 +51,7 @@ AC_ARG_WITH(readline,
        LDFLAGS="-L$with_readline/lib $LDFLAGS"
        CPPFLAGS="-I$with_readline/include $CPPFLAGS"
        TERMLIBS="-lreadline $TERMLIBS"
-       AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline])
+       EXTERNAL_READLINE=yes
        break], [TERMLIBS= CPPFLAGS=$_cppflags], $TERMLIBS)])
 
     ;;
@@ -67,6 +68,14 @@ AC_CHECK_LIB(readline, rl_completion_matches,
             [],
             [$TERMLIBS])
 
-SMB_EXT_LIB(READLINE, [${TERMLIBS}])
-
-SMB_SUBSYSTEM(LIBREADLINE, [lib/replace/readline.o], [EXT_LIB_READLINE])
+AC_MSG_CHECKING(whether to use extern readline)
+if test x"$EXTERNAL_READLINE" = x"yes"; then
+       AC_MSG_RESULT(yes)
+       AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline])
+       SMB_SUBSYSTEM(SMBREADLINE, [lib/replace/readline.o], [READLINE])
+       SMB_EXT_LIB(READLINE, [${TERMLIBS}])
+       SMB_ENABLE(READLINE,YES)
+else
+       SMB_SUBSYSTEM(SMBREADLINE, [lib/replace/readline.o], [])
+       AC_MSG_RESULT(no)
+fi