Line 0
Link Here
|
|
|
1 |
--- configure.orig 2015-08-05 08:12:21 UTC |
2 |
+++ configure |
3 |
@@ -23559,7 +23559,9 @@ fi |
4 |
|
5 |
if test $ac_with_krb5_count -gt 1 ; then |
6 |
as_fn_error $? "Please choose only one Kerberos library." "$LINENO" 5 |
7 |
-elif test $ac_with_krb5_count -eq 0 ; then |
8 |
+# XXX: On FreeBSD we don't need to involve krb5-config. |
9 |
+# This change makes GSSAPI_NONE work properly. |
10 |
+elif test $ac_with_krb5_count -eq 100 ; then |
11 |
# find installed libs via pkg-config or krb5-config |
12 |
if test -n "$PKG_CONFIG" && \ |
13 |
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gssapi-krb5 krb5\""; } >&5 |
14 |
@@ -31973,7 +31975,7 @@ done |
15 |
## |
16 |
|
17 |
BUILD_HELPER="NIS" |
18 |
-for ac_header in sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h crypt.h |
19 |
+for ac_header in sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h rpcsvc/crypt.h |
20 |
do : |
21 |
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
22 |
ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " |
23 |
@@ -31988,8 +31990,10 @@ if eval test \"x\$"$as_ac_Header"\" = x" |
24 |
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
25 |
_ACEOF |
26 |
|
27 |
-else |
28 |
- BUILD_HELPER="" |
29 |
+# XXX: On FreeBSD we have to do this to make NIS work |
30 |
+# until https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=188247 |
31 |
+# is resolved. |
32 |
+ BUILD_HELPER="NIS" |
33 |
fi |
34 |
|
35 |
done |
36 |
@@ -32454,7 +32458,7 @@ done |
37 |
|
38 |
# unconditionally requires crypt(3), for now |
39 |
if test "x$ac_cv_func_crypt" != "x"; then |
40 |
- for ac_header in unistd.h crypt.h shadow.h |
41 |
+ for ac_header in unistd.h rpcsvc/crypt.h shadow.h |
42 |
do : |
43 |
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
44 |
ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" |
45 |
@@ -34509,7 +34513,7 @@ for ac_header in \ |
46 |
arpa/nameser.h \ |
47 |
assert.h \ |
48 |
bstring.h \ |
49 |
- crypt.h \ |
50 |
+ rpcsvc/crypt.h \ |
51 |
ctype.h \ |
52 |
direct.h \ |
53 |
errno.h \ |