| @@ -1,36 +1,27 @@ | | | @@ -1,36 +1,27 @@ |
1 | $NetBSD: patch-aa,v 1.9 2008/08/29 08:32:41 tonnerre Exp $ | | 1 | $NetBSD: patch-aa,v 1.10 2010/06/05 14:50:12 wiz Exp $ |
2 | | | 2 | |
3 | --- configure.orig 2008-08-19 20:11:50.000000000 +0200 | | 3 | --- configure.orig 2008-08-19 20:11:50.000000000 +0200 |
4 | +++ configure | | 4 | +++ configure |
5 | @@ -6176,7 +6176,7 @@ fi | | 5 | @@ -6176,7 +6176,7 @@ fi |
6 | done | | 6 | done |
7 | | | 7 | |
8 | | | 8 | |
9 | -for ac_header in sys/xti.h | | 9 | -for ac_header in sys/xti.h |
10 | +for ac_header in socket.h sys/socket.h sys/xti.h | | 10 | +for ac_header in socket.h sys/socket.h sys/xti.h |
11 | do | | 11 | do |
12 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | | 12 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
13 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | | 13 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then |
14 | @@ -7834,7 +7834,12 @@ cat >>conftest.$ac_ext <<_ACEOF | | 14 | @@ -7834,7 +7834,12 @@ cat >>conftest.$ac_ext <<_ACEOF |
15 | /* end confdefs.h. */ | | 15 | /* end confdefs.h. */ |
16 | | | 16 | |
17 | #include <netinet/in.h> | | 17 | #include <netinet/in.h> |
18 | - | | 18 | - |
19 | +#ifdef HAVE_SOCKET_H | | 19 | +#ifdef HAVE_SOCKET_H |
20 | +#include <socket.h> | | 20 | +#include <socket.h> |
21 | +#endif | | 21 | +#endif |
22 | +#ifdef HAVE_SYS_SOCKET_H | | 22 | +#ifdef HAVE_SYS_SOCKET_H |
23 | +#include <sys/socket.h> | | 23 | +#include <sys/socket.h> |
24 | +#endif | | 24 | +#endif |
25 | | | 25 | |
26 | typedef socklen_t ac__type_new_; | | 26 | typedef socklen_t ac__type_new_; |
27 | int | | 27 | int |
28 | @@ -8570,6 +8575,8 @@ do | | | |
29 | case $ac_option in | | | |
30 | # Handling of the options. | | | |
31 | -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) | | | |
32 | + : Avoid regenerating within pkgsrc | | | |
33 | + exit 0 | | | |
34 | ac_cs_recheck=: ;; | | | |
35 | --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) | | | |
36 | echo "$ac_cs_version"; exit ;; | | | |