diff options
| author | Simo Sorce <simo@redhat.com> | 2013-03-26 11:11:41 -0400 |
|---|---|---|
| committer | Simo Sorce <simo@redhat.com> | 2013-03-26 12:15:19 -0400 |
| commit | df16cc255bf2d208a61c7d9810e3be6685b697a6 (patch) | |
| tree | 559b135388fa1fde8a76f6c3fbb8426a4c72ecc3 /aclocal | |
| parent | e79baddaa1d8cf24cce929e14f6f91ac0d5e15d0 (diff) | |
| download | nfs-utils-df16cc255bf2d208a61c7d9810e3be6685b697a6.tar.gz nfs-utils-df16cc255bf2d208a61c7d9810e3be6685b697a6.tar.xz nfs-utils-df16cc255bf2d208a61c7d9810e3be6685b697a6.zip | |
Switch to use standard GSSAPI by default
Make libgssglue configurable still but disabled by default.
There is no reason to use libgssglue anymore, and modern gssapi
supports all needed features for nfs-utils.
Signed-off-by: Simo Sorce <simo@redhat.com>
Diffstat (limited to 'aclocal')
| -rw-r--r-- | aclocal/kerberos5.m4 | 4 | ||||
| -rw-r--r-- | aclocal/rpcsec_vers.m4 | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/aclocal/kerberos5.m4 b/aclocal/kerberos5.m4 index 7574e2d..57cf45c 100644 --- a/aclocal/kerberos5.m4 +++ b/aclocal/kerberos5.m4 @@ -32,6 +32,8 @@ AC_DEFUN([AC_KERBEROS_V5],[ if test "$K5CONFIG" != ""; then KRBCFLAGS=`$K5CONFIG --cflags` KRBLIBS=`$K5CONFIG --libs` + GSSKRB_CFLAGS=`$K5CONFIG --cflags gssapi` + GSSKRB_LIBS=`$K5CONFIG --libs gssapi` K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'` AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number]) if test -f $dir/include/gssapi/gssapi_krb5.h -a \ @@ -111,5 +113,7 @@ AC_DEFUN([AC_KERBEROS_V5],[ AC_SUBST([KRBCFLAGS]) AC_SUBST([KRBLDFLAGS]) AC_SUBST([K5VERS]) + AC_SUBST([GSSKRB_CFLAGS]) + AC_SUBST([GSSKRB_LIBS]) ]) diff --git a/aclocal/rpcsec_vers.m4 b/aclocal/rpcsec_vers.m4 index 8218372..11d2f18 100644 --- a/aclocal/rpcsec_vers.m4 +++ b/aclocal/rpcsec_vers.m4 @@ -1,7 +1,12 @@ dnl Checks librpcsec version AC_DEFUN([AC_RPCSEC_VERSION], [ - PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.3]) + AC_ARG_WITH([gssglue], + [AC_HELP_STRING([--with-gssglue], [Use libgssglue for GSS support])]) + if test x"$with_gssglue" = x"yes"; then + PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.3]) + AC_CHECK_LIB([gssglue], [gss_set_allowable_enctypes]) + fi dnl TI-RPC replaces librpcsecgss if test "$enable_tirpc" = no; then |