summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac61
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 @@
1# $Id: configure.ac,v 1.575 2014/05/27 04:34:43 djm Exp $ 1# $Id: configure.ac,v 1.576 2014/06/13 01:06:04 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) 17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
18AC_REVISION($Revision: 1.575 $) 18AC_REVISION($Revision: 1.576 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -1380,62 +1380,6 @@ AC_ARG_WITH([skey],
1380 ] 1380 ]
1381) 1381)
1382 1382
1383# Check whether user wants TCP wrappers support
1384TCPW_MSG="no"
1385AC_ARG_WITH([tcp-wrappers],
1386 [ --with-tcp-wrappers[[=PATH]] Enable tcpwrappers support (optionally in PATH)],
1387 [
1388 if test "x$withval" != "xno" ; then
1389 saved_LIBS="$LIBS"
1390 saved_LDFLAGS="$LDFLAGS"
1391 saved_CPPFLAGS="$CPPFLAGS"
1392 if test -n "${withval}" && \
1393 test "x${withval}" != "xyes"; then
1394 if test -d "${withval}/lib"; then
1395 if test -n "${need_dash_r}"; then
1396 LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"
1397 else
1398 LDFLAGS="-L${withval}/lib ${LDFLAGS}"
1399 fi
1400 else
1401 if test -n "${need_dash_r}"; then
1402 LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}"
1403 else
1404 LDFLAGS="-L${withval} ${LDFLAGS}"
1405 fi
1406 fi
1407 if test -d "${withval}/include"; then
1408 CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
1409 else
1410 CPPFLAGS="-I${withval} ${CPPFLAGS}"
1411 fi
1412 fi
1413 LIBS="-lwrap $LIBS"
1414 AC_MSG_CHECKING([for libwrap])
1415 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
1416#include <sys/types.h>
1417#include <sys/socket.h>
1418#include <netinet/in.h>
1419#include <tcpd.h>
1420int deny_severity = 0, allow_severity = 0;
1421 ]], [[
1422 hosts_access(0);
1423 ]])], [
1424 AC_MSG_RESULT([yes])
1425 AC_DEFINE([LIBWRAP], [1],
1426 [Define if you want
1427 TCP Wrappers support])
1428 SSHDLIBS="$SSHDLIBS -lwrap"
1429 TCPW_MSG="yes"
1430 ], [
1431 AC_MSG_ERROR([*** libwrap missing])
1432
1433 ])
1434 LIBS="$saved_LIBS"
1435 fi
1436 ]
1437)
1438
1439# Check whether user wants to use ldns 1383# Check whether user wants to use ldns
1440LDNS_MSG="no" 1384LDNS_MSG="no"
1441AC_ARG_WITH(ldns, 1385AC_ARG_WITH(ldns,
@@ -4859,7 +4803,6 @@ echo " KerberosV support: $KRB5_MSG"
4859echo " SELinux support: $SELINUX_MSG" 4803echo " SELinux support: $SELINUX_MSG"
4860echo " Smartcard support: $SCARD_MSG" 4804echo " Smartcard support: $SCARD_MSG"
4861echo " S/KEY support: $SKEY_MSG" 4805echo " S/KEY support: $SKEY_MSG"
4862echo " TCP Wrappers support: $TCPW_MSG"
4863echo " MD5 password support: $MD5_MSG" 4806echo " MD5 password support: $MD5_MSG"
4864echo " libedit support: $LIBEDIT_MSG" 4807echo " libedit support: $LIBEDIT_MSG"
4865echo " Solaris process contract support: $SPC_MSG" 4808echo " Solaris process contract support: $SPC_MSG"