-dnl ------ Threads
-AC_ARG_ENABLE(threads, [ --enable-threads enable threads if available],
- [threads_ok=$enableval], [threads_ok=no])
-if test "$threads_ok" = "yes"; then
- AC_CHECK_HEADERS(pthread.h threads.h)
- AC_CHECK_FUNC(pthread_mutex_lock)
- if test "$ac_cv_func_pthread_mutex_lock" = "no"; then
- AC_CHECK_LIB(pthread, main)
+dnl ------ GNU Readline
+READLINE_LIBS=""
+AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline"])
+if test "$ac_cv_lib_readline_readline" = "no"; then
+ AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline -ltermcap"])
+fi
+AC_CHECK_LIB(history, add_history, [READLINE_LIBS="$READLINE_LIBS -lhistory"])
+if test "$ac_cv_lib_readline_readline" = "yes"; then
+ AC_CHECK_HEADERS(readline/readline.h readline/history.h)
+fi
+dnl ------ snprintf
+AC_CHECK_FUNCS(vsnprintf)
+dnl
+dnl ------ tcpd
+AC_ARG_ENABLE(tcpd,[ --enable-tcpd enable TCP wrapper for server if available])
+if test "$enable_tcpd" = "yes"; then
+ AC_MSG_CHECKING(for working tcpd.h)
+ oldLibs=$LIBS
+ LIBS="$LIBS -lwrap -lnsl"
+ AC_TRY_LINK([#include <syslog.h>
+ #include <tcpd.h>
+ int allow_severity = LOG_INFO;
+ int deny_severity = LOG_WARNING;],
+ [struct request_info request_info; int i;
+ i = hosts_access(&request_info);],tcpd_ok=1, tcpd_ok=0)
+ if test "$tcpd_ok" = "0"; then
+ AC_MSG_RESULT(no)
+ LIBS=$oldLibs
+ else
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_TCPD_H)