| blob | 53c75f13cf1528fc78fdf4441f35be6e8c02d6dc |
1 --- configure
2 +++ configure
3 @@ -26343,235 +26343,9 @@
5 echo "${nl}Checking for OS UUID Support..."
7 -for ac_header in uuid.h uuid/uuid.h sys/uuid.h
8 -do :
9 - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
10 -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
11 -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
12 - cat >>confdefs.h <<_ACEOF
13 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
14 -_ACEOF
15 - break
16 -fi
17 -
18 -done
19 -
20 -
21 -apr_revert_save_LIBS=$LIBS
22 -
23 -# Prefer the flavor(s) that live in libc;
24 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_create" >&5
25 -$as_echo_n "checking for library containing uuid_create... " >&6; }
26 -if ${ac_cv_search_uuid_create+:} false; then :
27 - $as_echo_n "(cached) " >&6
28 -else
29 - ac_func_search_save_LIBS=$LIBS
30 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
31 -/* end confdefs.h. */
32 -
33 -/* Override any GCC internal prototype to avoid an error.
34 - Use char because int might match the return type of a GCC
35 - builtin and then its argument prototype would still apply. */
36 -#ifdef __cplusplus
37 -extern "C"
38 -#endif
39 -char uuid_create ();
40 -int
41 -main ()
42 -{
43 -return uuid_create ();
44 - ;
45 - return 0;
46 -}
47 -_ACEOF
48 -for ac_lib in '' uuid; do
49 - if test -z "$ac_lib"; then
50 - ac_res="none required"
51 - else
52 - ac_res=-l$ac_lib
53 - LIBS="-l$ac_lib $ac_func_search_save_LIBS"
54 - fi
55 - if ac_fn_c_try_link "$LINENO"; then :
56 - ac_cv_search_uuid_create=$ac_res
57 -fi
58 -rm -f core conftest.err conftest.$ac_objext \
59 - conftest$ac_exeext
60 - if ${ac_cv_search_uuid_create+:} false; then :
61 - break
62 -fi
63 -done
64 -if ${ac_cv_search_uuid_create+:} false; then :
65 -
66 -else
67 - ac_cv_search_uuid_create=no
68 -fi
69 -rm conftest.$ac_ext
70 -LIBS=$ac_func_search_save_LIBS
71 -fi
72 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_create" >&5
73 -$as_echo "$ac_cv_search_uuid_create" >&6; }
74 -ac_res=$ac_cv_search_uuid_create
75 -if test "$ac_res" != no; then :
76 - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
77 -
78 -fi
79 -
80 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_generate" >&5
81 -$as_echo_n "checking for library containing uuid_generate... " >&6; }
82 -if ${ac_cv_search_uuid_generate+:} false; then :
83 - $as_echo_n "(cached) " >&6
84 -else
85 - ac_func_search_save_LIBS=$LIBS
86 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
87 -/* end confdefs.h. */
88 -
89 -/* Override any GCC internal prototype to avoid an error.
90 - Use char because int might match the return type of a GCC
91 - builtin and then its argument prototype would still apply. */
92 -#ifdef __cplusplus
93 -extern "C"
94 -#endif
95 -char uuid_generate ();
96 -int
97 -main ()
98 -{
99 -return uuid_generate ();
100 - ;
101 - return 0;
102 -}
103 -_ACEOF
104 -for ac_lib in '' uuid; do
105 - if test -z "$ac_lib"; then
106 - ac_res="none required"
107 - else
108 - ac_res=-l$ac_lib
109 - LIBS="-l$ac_lib $ac_func_search_save_LIBS"
110 - fi
111 - if ac_fn_c_try_link "$LINENO"; then :
112 - ac_cv_search_uuid_generate=$ac_res
113 -fi
114 -rm -f core conftest.err conftest.$ac_objext \
115 - conftest$ac_exeext
116 - if ${ac_cv_search_uuid_generate+:} false; then :
117 - break
118 -fi
119 -done
120 -if ${ac_cv_search_uuid_generate+:} false; then :
121 -
122 -else
123 - ac_cv_search_uuid_generate=no
124 -fi
125 -rm conftest.$ac_ext
126 -LIBS=$ac_func_search_save_LIBS
127 -fi
128 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_generate" >&5
129 -$as_echo "$ac_cv_search_uuid_generate" >&6; }
130 -ac_res=$ac_cv_search_uuid_generate
131 -if test "$ac_res" != no; then :
132 - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
133 -
134 -fi
135 -
136 -if test "$ac_cv_search_uuid_create" = "none required" -o \
137 - "$ac_cv_search_uuid_generate" = "none required"; then
138 - LIBS=$apr_revert_save_LIBS
139 -fi
140 -
141 -for ac_func in uuid_create uuid_generate
142 -do :
143 - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
144 -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
145 -if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
146 - cat >>confdefs.h <<_ACEOF
147 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
148 -_ACEOF
149 -
150 -fi
151 -done
152 -
153 -
154 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for os uuid usability" >&5
155 -$as_echo_n "checking for os uuid usability... " >&6; }
156 -if ${apr_cv_osuuid+:} false; then :
157 - $as_echo_n "(cached) " >&6
158 -else
159 -
160 -# Ensure this test closely mirrors misc/unix/rand.c!
161 -uuid_includes="
162 -#if defined(HAVE_SYS_TYPES_H)
163 -#include <sys/types.h>
164 -#endif
165 -#if defined(HAVE_UNISTD_H)
166 -#include <unistd.h>
167 -#endif
168 -#if defined(HAVE_UUID_H)
169 -#include <uuid.h>
170 -#elif defined(HAVE_UUID_UUID_H)
171 -#include <uuid/uuid.h>
172 -#elif defined(HAVE_SYS_UUID_H)
173 -#include <sys/uuid.h>
174 -#endif
175 -"
176 - apr_cv_osuuid=no
177 - if test $ac_cv_func_uuid_create = yes; then
178 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
179 -/* end confdefs.h. */
180 -$uuid_includes
181 -int
182 -main ()
183 -{
184 -
185 - uuid_t g;
186 - uint32_t s;
187 - uuid_create(&g, &s);
188 - if (s == uuid_s_ok) s = 0;
189 -
190 - ;
191 - return 0;
192 -}
193 -_ACEOF
194 -if ac_fn_c_try_link "$LINENO"; then :
195 - apr_cv_osuuid=yes
196 -else
197 - apr_cv_func_uuid_create=no
198 -fi
199 -rm -f core conftest.err conftest.$ac_objext \
200 - conftest$ac_exeext conftest.$ac_ext
201 - fi
202 - if test $ac_cv_func_uuid_generate = yes; then
203 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
204 -/* end confdefs.h. */
205 -$uuid_includes
206 -int
207 -main ()
208 -{
209 -
210 - uuid_t g;
211 - uuid_generate(g);
212 -
213 - ;
214 - return 0;
215 -}
216 -_ACEOF
217 -if ac_fn_c_try_link "$LINENO"; then :
218 - apr_cv_osuuid=yes
219 -else
220 - apr_cv_func_uuid_generate=no
221 -fi
222 -rm -f core conftest.err conftest.$ac_objext \
223 - conftest$ac_exeext conftest.$ac_ext
224 - fi
225 -
226 -fi
227 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_osuuid" >&5
228 -$as_echo "$apr_cv_osuuid" >&6; }
229 -
230 -if test $apr_cv_osuuid = yes; then
231 - osuuid="1"
232 -else
233 - osuuid="0"
234 - LIBS=$apr_revert_save_LIBS
235 -fi
236 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
237 +$as_echo no >&6; }
238 +osuuid="0"