blob: 01621daa59bee3460da0597cb683d9f543a17cff (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
$NetBSD: patch-aa,v 1.30 2015/04/22 14:35:21 jperkin Exp $
builtin krb5-config in platforms such as solaris do not support
the gssapi option, and need an explicit -lgss
--- configure.orig 2015-04-21 07:21:35.000000000 +0000
+++ configure
@@ -3703,6 +3703,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
;;
esac
done
+ xc_bad_var_cflags=no
if test $xc_bad_var_cflags = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5
$as_echo "$as_me: using CFLAGS: $CFLAGS" >&6;}
@@ -16682,7 +16683,7 @@ squeeze() {
#
- if test "$compiler_id" != "unknown"; then
+ if false; then
#
if test "$compiler_id" = "GNU_C" ||
test "$compiler_id" = "CLANG"; then
@@ -21131,6 +21132,11 @@ $as_echo "yes" >&6; }
GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
+ if $GSSAPI_ROOT/bin/krb5-config --cflags gssapi 2>&1 | grep "Unknown option" >/dev/null; then
+ GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags`
+ else
+ GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
+ fi
elif test -f "$KRB5CONFIG"; then
GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
elif test "$GSSAPI_ROOT" != "yes"; then
@@ -21305,7 +21311,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
LIBS="-lgss $LIBS"
;;
*)
- LIBS="-lgssapi $LIBS"
+ LIBS="-lgssapi -lkrb5 $LIBS"
;;
esac
fi
@@ -24264,7 +24270,7 @@ _ACEOF
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $capath (capath)" >&5
$as_echo "$capath (capath)" >&6; }
fi
- if test "x$ca" == "xno" && test "x$capath" == "xno"; then
+ if test "x$ca" = "xno" && test "x$capath" = "xno"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
|
