- (dtucker) [configure.ac] Use a proper AC_CHECK_DECL for BROKEN_GETADDRINFO

so setting it in CFLAGS correctly skips IPv6 tests.
This commit is contained in:
Darren Tucker 2010-03-09 20:42:30 +11:00
parent 081c976e1c
commit c9fe39b1a4
2 changed files with 10 additions and 8 deletions

View File

@ -1,4 +1,8 @@
20100307
20100309
- (dtucker) [configure.ac] Use a proper AC_CHECK_DECL for BROKEN_GETADDRINFO
so setting it in CFLAGS correctly skips IPv6 tests.
20100308
- (djm) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2010/03/07 22:16:01
[ssh-keygen.c]

View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.444 2010/03/05 04:04:35 djm Exp $
# $Id: configure.ac,v 1.445 2010/03/09 09:42:31 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.444 $)
AC_REVISION($Revision: 1.445 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_CONFIG_HEADER(config.h)
@ -4128,12 +4128,10 @@ dnl Adding -Werror to CFLAGS early prevents configure tests from running.
dnl Add now.
CFLAGS="$CFLAGS $werror_flags"
if grep "#define BROKEN_GETADDRINFO 1" confdefs.h >/dev/null || \
test "x$ac_cv_func_getaddrinfo" != "xyes" ; then
AC_SUBST(TEST_SSH_IPV6, no)
else
AC_CHECK_DECL(BROKEN_GETADDRINFO,
AC_SUBST(TEST_SSH_IPV6, no),
AC_SUBST(TEST_SSH_IPV6, yes)
fi
)
AC_EXEEXT
AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \