diff options
author | Tim Rice <tim@multitalents.net> | 2008-11-18 21:26:41 -0800 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2008-11-18 21:26:41 -0800 |
commit | 0f4d2c02f275ad9f80ccd7435ffb407a8be61e9a (patch) | |
tree | a43f4cd82ace12ebb5ab6490d62f13469dd16263 /configure.ac | |
parent | edecb37a4b7e1b31f69139344af927e602f31c11 (diff) |
- (tim) [addrmatch.c configure.ac] Some platforms do not have sin6_scope_id
member of sockaddr_in6. Also reported in Bug 1491 by David Leonard. OK and
feedback by djm@
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index fcf7e416b..3e0821bae 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.409 2008/07/09 11:07:19 djm Exp $ | 1 | # $Id: configure.ac,v 1.410 2008/11/19 05:26:42 tim 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 | ||
17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) | 17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) |
18 | AC_REVISION($Revision: 1.409 $) | 18 | AC_REVISION($Revision: 1.410 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | AC_CONFIG_HEADER(config.h) | 21 | AC_CONFIG_HEADER(config.h) |
@@ -2824,6 +2824,15 @@ AC_CACHE_CHECK([for struct in6_addr], ac_cv_have_struct_in6_addr, [ | |||
2824 | if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then | 2824 | if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then |
2825 | AC_DEFINE(HAVE_STRUCT_IN6_ADDR, 1, | 2825 | AC_DEFINE(HAVE_STRUCT_IN6_ADDR, 1, |
2826 | [define if you have struct in6_addr data type]) | 2826 | [define if you have struct in6_addr data type]) |
2827 | |||
2828 | dnl Now check for sin6_scope_id | ||
2829 | AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,, | ||
2830 | [ | ||
2831 | #ifdef HAVE_SYS_TYPES_H | ||
2832 | #include <sys/types.h> | ||
2833 | #endif | ||
2834 | #include <netinet/in.h> | ||
2835 | ]) | ||
2827 | fi | 2836 | fi |
2828 | 2837 | ||
2829 | AC_CACHE_CHECK([for struct addrinfo], ac_cv_have_struct_addrinfo, [ | 2838 | AC_CACHE_CHECK([for struct addrinfo], ac_cv_have_struct_addrinfo, [ |