diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2014-06-13 03:06:04 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2014-06-13 03:06:04 +0200 |
| commit | f9696566fb41320820f3b257ab564fa321bb3751 (patch) | |
| tree | 3c6661829bae0334fe0ef0a6da48fa7d8788a854 /configure.ac | |
| parent | - (tim) [regress/unittests/test_helper/test_helper.h] Add includes.h for (diff) | |
| download | openssh-f9696566fb41320820f3b257ab564fa321bb3751.tar.xz openssh-f9696566fb41320820f3b257ab564fa321bb3751.zip | |
- (dtucker) [configure.ac] Remove tcpwrappers support, support has already
been removed from sshd.c.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 61 |
1 files changed, 2 insertions, 59 deletions
diff --git a/configure.ac b/configure.ac index 66fbe821f..f48ba4a49 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.575 2014/05/27 04:34:43 djm Exp $ +# $Id: configure.ac,v 1.576 2014/06/13 01:06:04 dtucker Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) -AC_REVISION($Revision: 1.575 $) +AC_REVISION($Revision: 1.576 $) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) @@ -1380,62 +1380,6 @@ AC_ARG_WITH([skey], ] ) -# Check whether user wants TCP wrappers support -TCPW_MSG="no" -AC_ARG_WITH([tcp-wrappers], - [ --with-tcp-wrappers[[=PATH]] Enable tcpwrappers support (optionally in PATH)], - [ - if test "x$withval" != "xno" ; then - saved_LIBS="$LIBS" - saved_LDFLAGS="$LDFLAGS" - saved_CPPFLAGS="$CPPFLAGS" - if test -n "${withval}" && \ - test "x${withval}" != "xyes"; then - if test -d "${withval}/lib"; then - if test -n "${need_dash_r}"; then - LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" - else - LDFLAGS="-L${withval}/lib ${LDFLAGS}" - fi - else - if test -n "${need_dash_r}"; then - LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" - else - LDFLAGS="-L${withval} ${LDFLAGS}" - fi - fi - if test -d "${withval}/include"; then - CPPFLAGS="-I${withval}/include ${CPPFLAGS}" - else - CPPFLAGS="-I${withval} ${CPPFLAGS}" - fi - fi - LIBS="-lwrap $LIBS" - AC_MSG_CHECKING([for libwrap]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <tcpd.h> -int deny_severity = 0, allow_severity = 0; - ]], [[ - hosts_access(0); - ]])], [ - AC_MSG_RESULT([yes]) - AC_DEFINE([LIBWRAP], [1], - [Define if you want - TCP Wrappers support]) - SSHDLIBS="$SSHDLIBS -lwrap" - TCPW_MSG="yes" - ], [ - AC_MSG_ERROR([*** libwrap missing]) - - ]) - LIBS="$saved_LIBS" - fi - ] -) - # Check whether user wants to use ldns LDNS_MSG="no" AC_ARG_WITH(ldns, @@ -4859,7 +4803,6 @@ echo " KerberosV support: $KRB5_MSG" echo " SELinux support: $SELINUX_MSG" echo " Smartcard support: $SCARD_MSG" echo " S/KEY support: $SKEY_MSG" -echo " TCP Wrappers support: $TCPW_MSG" echo " MD5 password support: $MD5_MSG" echo " libedit support: $LIBEDIT_MSG" echo " Solaris process contract support: $SPC_MSG" |