46 lines
1.5 KiB
Text
46 lines
1.5 KiB
Text
$NetBSD: patch-aa,v 1.33 2015/08/08 02:44:16 spz Exp $
|
|
|
|
builtin krb5-config in platforms such as solaris do not support
|
|
the gssapi option, and need an explicit -lgss
|
|
|
|
--- configure.orig 2015-06-15 21:31:47.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;}
|
|
@@ -16689,7 +16690,7 @@ squeeze() {
|
|
|
|
|
|
#
|
|
- if test "$compiler_id" != "unknown"; then
|
|
+ if false; then
|
|
#
|
|
if test "$compiler_id" = "GNU_C" ||
|
|
test "$compiler_id" = "CLANG"; then
|
|
@@ -21137,7 +21138,11 @@ $as_echo "yes" >&6; }
|
|
if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
|
|
GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
|
|
elif test -f "$KRB5CONFIG"; then
|
|
- GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
|
|
+ if `$KRB5CONFIG --cflags gssapi` 2>&1 | grep "Unknown option" >/dev/null; then
|
|
+ GSSAPI_INCS=`$KRB5CONFIG --cflags`
|
|
+ else
|
|
+ GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
|
|
+ fi
|
|
elif test "$GSSAPI_ROOT" != "yes"; then
|
|
GSSAPI_INCS="-I$GSSAPI_ROOT/include"
|
|
fi
|
|
@@ -21310,7 +21315,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
|
|
LIBS="-lgss $LIBS"
|
|
;;
|
|
*)
|
|
- LIBS="-lgssapi $LIBS"
|
|
+ LIBS="-lgssapi -lkrb5 $LIBS"
|
|
;;
|
|
esac
|
|
fi
|