summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-11 04:15:05 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-06-11 04:15:05 +1000
commit5d37690a1f702db627f00146a5ace7949676eeb0 (patch)
tree84e6ccd92c59a675763ff86eadc2c7889f825b8b /configure.ac
parentd8bafea5a0008c9feb87237110037c45e8a0f8d3 (diff)
- (dtucker) [Makefile.in configure.ac regress/addrmatch.sh] Skip IPv6
specific tests on platforms that don't do IPv6.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac11
1 files changed, 9 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 9f39b2333..130ef6bc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.402 2008/06/08 20:17:53 dtucker Exp $ 1# $Id: configure.ac,v 1.403 2008/06/10 18:15:05 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.402 $) 18AC_REVISION($Revision: 1.403 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -4068,6 +4068,13 @@ dnl Adding -Werror to CFLAGS early prevents configure tests from running.
4068dnl Add now. 4068dnl Add now.
4069CFLAGS="$CFLAGS $werror_flags" 4069CFLAGS="$CFLAGS $werror_flags"
4070 4070
4071if grep "#define BROKEN_GETADDRINFO 1" confdefs.h >/dev/null || \
4072 test "x$ac_cv_func_getaddrinfo" != "xyes" ; then
4073 AC_SUBST(TEST_SSH_IPV6, no)
4074else
4075 AC_SUBST(TEST_SSH_IPV6, yes)
4076fi
4077
4071AC_EXEEXT 4078AC_EXEEXT
4072AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \ 4079AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \
4073 openbsd-compat/Makefile openbsd-compat/regress/Makefile \ 4080 openbsd-compat/Makefile openbsd-compat/regress/Makefile \