summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-04-10 22:58:01 +1000
committerDarren Tucker <dtucker@zip.com.au>2010-04-10 22:58:01 +1000
commit627337d95bee7dd8d4690238a35fffd35072d1fa (patch)
tree34a53728346c043644404d7c9df0e5222053ba51
parent261d93a5cfe7ceecba3daa0e8f827c21dfdc7f23 (diff)
- (dtucker) [configure.ac] Put the check for the existence of getaddrinfoV_5_5_P1
back so we disable the IPv6 tests if we don't have it.
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac15
2 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index eca278f2..39e0ba45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20100410
+ - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo
+ back so we disable the IPv6 tests if we don't have it.
+
20100409
- (dtucker) [contrib/cygwin/Makefile] Don't overwrite files with the wrong
ones. Based on a patch from Roumen Petrov.
diff --git a/configure.ac b/configure.ac
index a564c134..0a0e2ea1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.448 2010/04/09 08:13:27 dtucker Exp $
+# $Id: configure.ac,v 1.449 2010/04/10 12:58:01 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.448 $)
+AC_REVISION($Revision: 1.449 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_CONFIG_HEADER(config.h)
@@ -4123,10 +4123,13 @@ dnl Adding -Werror to CFLAGS early prevents configure tests from running.
dnl Add now.
CFLAGS="$CFLAGS $werror_flags"
-AC_CHECK_DECL(BROKEN_GETADDRINFO,
- AC_SUBST(TEST_SSH_IPV6, no),
- AC_SUBST(TEST_SSH_IPV6, yes)
-)
+if test "x$ac_cv_func_getaddrinfo" != "xyes" ; then
+ TEST_SSH_IPV6=no
+else
+ TEST_SSH_IPV6=yes
+fi
+AC_CHECK_DECL(BROKEN_GETADDRINFO, TEST_SSH_IPV6=no)
+AC_SUBST(TEST_SSH_IPV6, $TEST_SSH_IPV6)
AC_EXEEXT
AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \