diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 99a85264c..bdc198592 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.121 2003/05/15 11:42:59 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.122 2003/05/18 10:52:40 djm Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -95,7 +95,6 @@ case "$host" in | |||
95 | AC_DEFINE(HAVE_CYGWIN) | 95 | AC_DEFINE(HAVE_CYGWIN) |
96 | AC_DEFINE(USE_PIPES) | 96 | AC_DEFINE(USE_PIPES) |
97 | AC_DEFINE(DISABLE_SHADOW) | 97 | AC_DEFINE(DISABLE_SHADOW) |
98 | AC_DEFINE(IPV4_DEFAULT) | ||
99 | AC_DEFINE(IP_TOS_IS_BROKEN) | 98 | AC_DEFINE(IP_TOS_IS_BROKEN) |
100 | AC_DEFINE(NO_X11_UNIX_SOCKETS) | 99 | AC_DEFINE(NO_X11_UNIX_SOCKETS) |
101 | AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT) | 100 | AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT) |
@@ -2249,18 +2248,6 @@ AC_ARG_WITH(superuser-path, | |||
2249 | ) | 2248 | ) |
2250 | 2249 | ||
2251 | 2250 | ||
2252 | # Whether to force IPv4 by default (needed on broken glibc Linux) | ||
2253 | IPV4_HACK_MSG="no" | ||
2254 | AC_ARG_WITH(ipv4-default, | ||
2255 | [ --with-ipv4-default Use IPv4 by connections unless '-6' specified], | ||
2256 | [ | ||
2257 | if test "x$withval" != "xno" ; then | ||
2258 | AC_DEFINE(IPV4_DEFAULT) | ||
2259 | IPV4_HACK_MSG="yes" | ||
2260 | fi | ||
2261 | ] | ||
2262 | ) | ||
2263 | |||
2264 | AC_MSG_CHECKING([if we need to convert IPv4 in IPv6-mapped addresses]) | 2251 | AC_MSG_CHECKING([if we need to convert IPv4 in IPv6-mapped addresses]) |
2265 | IPV4_IN6_HACK_MSG="no" | 2252 | IPV4_IN6_HACK_MSG="no" |
2266 | AC_ARG_WITH(4in6, | 2253 | AC_ARG_WITH(4in6, |
@@ -2601,7 +2588,6 @@ echo " S/KEY support: $SKEY_MSG" | |||
2601 | echo " TCP Wrappers support: $TCPW_MSG" | 2588 | echo " TCP Wrappers support: $TCPW_MSG" |
2602 | echo " MD5 password support: $MD5_MSG" | 2589 | echo " MD5 password support: $MD5_MSG" |
2603 | echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" | 2590 | echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" |
2604 | echo " Use IPv4 by default hack: $IPV4_HACK_MSG" | ||
2605 | echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" | 2591 | echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" |
2606 | echo " BSD Auth support: $BSD_AUTH_MSG" | 2592 | echo " BSD Auth support: $BSD_AUTH_MSG" |
2607 | echo " Random number source: $RAND_MSG" | 2593 | echo " Random number source: $RAND_MSG" |