summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac12
2 files changed, 10 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index d6e4a4a25..c03d20f49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
120100307 120100309
2 - (dtucker) [configure.ac] Use a proper AC_CHECK_DECL for BROKEN_GETADDRINFO
3 so setting it in CFLAGS correctly skips IPv6 tests.
4
520100308
2 - (djm) OpenBSD CVS Sync 6 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2010/03/07 22:16:01 7 - djm@cvs.openbsd.org 2010/03/07 22:16:01
4 [ssh-keygen.c] 8 [ssh-keygen.c]
diff --git a/configure.ac b/configure.ac
index a9960a7ba..331fb4572 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.444 2010/03/05 04:04:35 djm Exp $ 1# $Id: configure.ac,v 1.445 2010/03/09 09:42:31 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.444 $) 18AC_REVISION($Revision: 1.445 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -4128,12 +4128,10 @@ dnl Adding -Werror to CFLAGS early prevents configure tests from running.
4128dnl Add now. 4128dnl Add now.
4129CFLAGS="$CFLAGS $werror_flags" 4129CFLAGS="$CFLAGS $werror_flags"
4130 4130
4131if grep "#define BROKEN_GETADDRINFO 1" confdefs.h >/dev/null || \ 4131AC_CHECK_DECL(BROKEN_GETADDRINFO,
4132 test "x$ac_cv_func_getaddrinfo" != "xyes" ; then 4132 AC_SUBST(TEST_SSH_IPV6, no),
4133 AC_SUBST(TEST_SSH_IPV6, no)
4134else
4135 AC_SUBST(TEST_SSH_IPV6, yes) 4133 AC_SUBST(TEST_SSH_IPV6, yes)
4136fi 4134)
4137 4135
4138AC_EXEEXT 4136AC_EXEEXT
4139AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \ 4137AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \