| @@ -1,95 +1,133 @@ | | | @@ -1,95 +1,133 @@ |
1 | $NetBSD: patch-configure,v 1.1 2013/09/14 09:06:48 ryoon Exp $ | | 1 | $NetBSD: patch-configure,v 1.2 2014/04/23 14:47:43 fhajny Exp $ |
2 | | | 2 | |
3 | --- configure.orig 2013-09-09 07:15:14.000000000 +0000 | | 3 | --- configure.orig 2013-09-09 07:15:14.000000000 +0000 |
4 | +++ configure | | 4 | +++ configure |
5 | @@ -1899,6 +1899,52 @@ $as_echo "$ac_res" >&6; } | | 5 | @@ -1899,6 +1899,52 @@ $as_echo "$ac_res" >&6; } |
6 | eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno | | 6 | eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
7 | | | 7 | |
8 | } # ac_fn_c_check_func | | 8 | } # ac_fn_c_check_func |
9 | + | | 9 | + |
10 | +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES | | 10 | +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES |
11 | +# --------------------------------------------- | | 11 | +# --------------------------------------------- |
12 | +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR | | 12 | +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR |
13 | +# accordingly. | | 13 | +# accordingly. |
14 | +ac_fn_c_check_decl () | | 14 | +ac_fn_c_check_decl () |
15 | +{ | | 15 | +{ |
16 | + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | | 16 | + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
17 | + as_decl_name=`echo $2|sed 's/ *(.*//'` | | 17 | + as_decl_name=`echo $2|sed 's/ *(.*//'` |
18 | + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` | | 18 | + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` |
19 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 | | 19 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 |
20 | +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } | | 20 | +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } |
21 | +if eval \${$3+:} false; then : | | 21 | +if eval \${$3+:} false; then : |
22 | + $as_echo_n "(cached) " >&6 | | 22 | + $as_echo_n "(cached) " >&6 |
23 | +else | | 23 | +else |
24 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | | 24 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
25 | +/* end confdefs.h. */ | | 25 | +/* end confdefs.h. */ |
26 | +$4 | | 26 | +$4 |
27 | +int | | 27 | +int |
28 | +main () | | 28 | +main () |
29 | +{ | | 29 | +{ |
30 | +#ifndef $as_decl_name | | 30 | +#ifndef $as_decl_name |
31 | +#ifdef __cplusplus | | 31 | +#ifdef __cplusplus |
32 | + (void) $as_decl_use; | | 32 | + (void) $as_decl_use; |
33 | +#else | | 33 | +#else |
34 | + (void) $as_decl_name; | | 34 | + (void) $as_decl_name; |
35 | +#endif | | 35 | +#endif |
36 | +#endif | | 36 | +#endif |
37 | + | | 37 | + |
38 | + ; | | 38 | + ; |
39 | + return 0; | | 39 | + return 0; |
40 | +} | | 40 | +} |
41 | +_ACEOF | | 41 | +_ACEOF |
42 | +if ac_fn_c_try_compile "$LINENO"; then : | | 42 | +if ac_fn_c_try_compile "$LINENO"; then : |
43 | + eval "$3=yes" | | 43 | + eval "$3=yes" |
44 | +else | | 44 | +else |
45 | + eval "$3=no" | | 45 | + eval "$3=no" |
46 | +fi | | 46 | +fi |
47 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | | 47 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
48 | +fi | | 48 | +fi |
49 | +eval ac_res=\$$3 | | 49 | +eval ac_res=\$$3 |
50 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | | 50 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
51 | +$as_echo "$ac_res" >&6; } | | 51 | +$as_echo "$ac_res" >&6; } |
52 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno | | 52 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
53 | + | | 53 | + |
54 | +} # ac_fn_c_check_decl | | 54 | +} # ac_fn_c_check_decl |
55 | cat >config.log <<_ACEOF | | 55 | cat >config.log <<_ACEOF |
56 | This file contains any messages produced by compilers while | | 56 | This file contains any messages produced by compilers while |
57 | running configure, to aid debugging if configure makes a mistake. | | 57 | running configure, to aid debugging if configure makes a mistake. |
58 | @@ -12865,7 +12911,7 @@ $as_echo "#define HAVE_CRYPT /**/" >>con | | 58 | @@ -12865,7 +12911,7 @@ $as_echo "#define HAVE_CRYPT /**/" >>con |
59 | fi | | 59 | fi |
60 | | | 60 | |
61 | | | 61 | |
62 | -for ac_func in strlcpy statvfs | | 62 | -for ac_func in strlcpy statvfs |
63 | +for ac_func in strlcpy statvfs, mkdtemp | | 63 | +for ac_func in strlcpy statvfs, mkdtemp |
64 | do : | | 64 | do : |
65 | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | | 65 | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` |
66 | ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | | 66 | ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" |
67 | @@ -12878,6 +12924,28 @@ fi | | 67 | @@ -12878,6 +12924,28 @@ fi |
68 | done | | 68 | done |
69 | | | 69 | |
70 | | | 70 | |
71 | +ac_fn_c_check_decl "$LINENO" "AI_V4MAPPED" "ac_cv_have_decl_AI_V4MAPPED" "$ac_includes_default" | | 71 | +ac_fn_c_check_decl "$LINENO" "AI_V4MAPPED" "ac_cv_have_decl_AI_V4MAPPED" "$ac_includes_default" |
72 | +if test "x$ac_cv_have_decl_AI_V4MAPPED" = xyes; then : | | 72 | +if test "x$ac_cv_have_decl_AI_V4MAPPED" = xyes; then : |
73 | + ac_have_decl=1 | | 73 | + ac_have_decl=1 |
74 | +else | | 74 | +else |
75 | + ac_have_decl=0 | | 75 | + ac_have_decl=0 |
76 | +fi | | 76 | +fi |
77 | + | | 77 | + |
78 | +cat >>confdefs.h <<_ACEOF | | 78 | +cat >>confdefs.h <<_ACEOF |
79 | +#define HAVE_DECL_AI_V4MAPPED $ac_have_decl | | 79 | +#define HAVE_DECL_AI_V4MAPPED $ac_have_decl |
80 | +_ACEOF | | 80 | +_ACEOF |
81 | +ac_fn_c_check_decl "$LINENO" "AI_ALL" "ac_cv_have_decl_AI_ALL" "$ac_includes_default" | | 81 | +ac_fn_c_check_decl "$LINENO" "AI_ALL" "ac_cv_have_decl_AI_ALL" "$ac_includes_default" |
82 | +if test "x$ac_cv_have_decl_AI_ALL" = xyes; then : | | 82 | +if test "x$ac_cv_have_decl_AI_ALL" = xyes; then : |
83 | + ac_have_decl=1 | | 83 | + ac_have_decl=1 |
84 | +else | | 84 | +else |
85 | + ac_have_decl=0 | | 85 | + ac_have_decl=0 |
86 | +fi | | 86 | +fi |
87 | + | | 87 | + |
88 | +cat >>confdefs.h <<_ACEOF | | 88 | +cat >>confdefs.h <<_ACEOF |
89 | +#define HAVE_DECL_AI_ALL $ac_have_decl | | 89 | +#define HAVE_DECL_AI_ALL $ac_have_decl |
90 | +_ACEOF | | 90 | +_ACEOF |
91 | + | | 91 | + |
92 | + | | 92 | + |
93 | if test Darwin != `uname`; then | | 93 | if test Darwin != `uname`; then |
94 | # FIXME: Make -lrt conditional on _XOPEN_REALTIME | | 94 | # FIXME: Make -lrt conditional on _XOPEN_REALTIME |
95 | POSIX_EXTRA_CFLAGS=-D_XOPEN_SOURCE=700 | | 95 | POSIX_EXTRA_CFLAGS=-D_XOPEN_SOURCE=700 |
| | | 96 | @@ -13690,7 +13758,7 @@ fi |
| | | 97 | $as_echo_n "checking $_ax_check_text... " >&6; } |
| | | 98 | |
| | | 99 | _ax_test_ver=`$LUA -e "print(_VERSION)" 2>/dev/null | \ |
| | | 100 | - sed "s|^Lua \(.*\)|\1|" | grep -o "^[0-9]\+\\.[0-9]\+"` |
| | | 101 | + sed "s|^Lua \([0-9]*\.[0-9]*\)|\1|"` |
| | | 102 | if test "x$_ax_test_ver" = 'x'; then : |
| | | 103 | _ax_test_ver='0' |
| | | 104 | fi |
| | | 105 | @@ -13796,7 +13864,7 @@ fi |
| | | 106 | |
| | | 107 | |
| | | 108 | _ax_test_ver=`$ax_cv_pathless_LUA -e "print(_VERSION)" 2>/dev/null | \ |
| | | 109 | - sed "s|^Lua \(.*\)|\1|" | grep -o "^[0-9]\+\\.[0-9]\+"` |
| | | 110 | + sed "s|^Lua \([0-9]*\.[0-9]*\)|\1|"` |
| | | 111 | if test "x$_ax_test_ver" = 'x'; then : |
| | | 112 | _ax_test_ver='0' |
| | | 113 | fi |
| | | 114 | @@ -13941,8 +14009,7 @@ if ${ax_cv_lua_version+:} false; then : |
| | | 115 | $as_echo_n "(cached) " >&6 |
| | | 116 | else |
| | | 117 | ax_cv_lua_version=`$LUA -e "print(_VERSION)" | \ |
| | | 118 | - sed "s|^Lua \(.*\)|\1|" | \ |
| | | 119 | - grep -o "^[0-9]\+\\.[0-9]\+"` |
| | | 120 | + sed "s|^Lua \([0-9]*\.[0-9]*\)|\1|"` |
| | | 121 | |
| | | 122 | fi |
| | | 123 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lua_version" >&5 |
| | | 124 | @@ -14181,8 +14248,7 @@ int main(int argc, char ** argv) |
| | | 125 | _ACEOF |
| | | 126 | if ac_fn_c_try_run "$LINENO"; then : |
| | | 127 | ax_cv_lua_header_version=`./conftest$EXEEXT p | \ |
| | | 128 | - sed "s|^Lua \(.*\)|\1|" | \ |
| | | 129 | - grep -o "^[0-9]\+\\.[0-9]\+"` |
| | | 130 | + sed "s|^Lua \([0-9]*\.[0-9]*\)|\1|"` |
| | | 131 | |
| | | 132 | else |
| | | 133 | ax_cv_lua_header_version='unknown' |