diff options
| author | Günther Deschner <gdeschner@redhat.com> | 2013-02-22 18:24:39 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2013-03-22 19:28:33 +0100 |
| commit | ecf9b2126af3409a68fe5a2c75602eaaeee92b8e (patch) | |
| tree | 6e293240ac6ff7d0f2906fb1c01f50680685c31d | |
| parent | 38b804aa6f075f5abb08c8aafd9430c2d22441e2 (diff) | |
| download | nfs-utils-ecf9b2126af3409a68fe5a2c75602eaaeee92b8e.tar.gz nfs-utils-ecf9b2126af3409a68fe5a2c75602eaaeee92b8e.tar.xz nfs-utils-ecf9b2126af3409a68fe5a2c75602eaaeee92b8e.zip | |
Remove libgssglue support, instead use gssapi library directly.
| -rw-r--r-- | aclocal/kerberos5.m4 | 4 | ||||
| -rw-r--r-- | aclocal/rpcsec_vers.m4 | 2 | ||||
| -rw-r--r-- | utils/gssd/Makefile.am | 10 |
3 files changed, 7 insertions, 9 deletions
diff --git a/aclocal/kerberos5.m4 b/aclocal/kerberos5.m4 index 7574e2d..1114988 100644 --- a/aclocal/kerberos5.m4 +++ b/aclocal/kerberos5.m4 @@ -30,8 +30,8 @@ AC_DEFUN([AC_KERBEROS_V5],[ K5CONFIG="/usr/lib/mit/bin/krb5-config" fi if test "$K5CONFIG" != ""; then - KRBCFLAGS=`$K5CONFIG --cflags` - KRBLIBS=`$K5CONFIG --libs` + KRBCFLAGS=`$K5CONFIG --cflags gssapi` + KRBLIBS=`$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 \ diff --git a/aclocal/rpcsec_vers.m4 b/aclocal/rpcsec_vers.m4 index 8218372..d84cda0 100644 --- a/aclocal/rpcsec_vers.m4 +++ b/aclocal/rpcsec_vers.m4 @@ -1,8 +1,6 @@ dnl Checks librpcsec version AC_DEFUN([AC_RPCSEC_VERSION], [ - PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.3]) - dnl TI-RPC replaces librpcsecgss if test "$enable_tirpc" = no; then PKG_CHECK_MODULES([RPCSECGSS], [librpcsecgss >= 0.16]) diff --git a/utils/gssd/Makefile.am b/utils/gssd/Makefile.am index 2365704..7530147 100644 --- a/utils/gssd/Makefile.am +++ b/utils/gssd/Makefile.am @@ -38,11 +38,11 @@ gssd_SOURCES = \ write_bytes.h gssd_LDADD = ../../support/nfs/libnfs.a \ - $(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(KRBLIBS) + $(RPCSECGSS_LIBS) $(KRBLIBS) gssd_LDFLAGS = $(KRBLDFLAGS) $(LIBTIRPC) gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \ - $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS) + $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) svcgssd_SOURCES = \ $(COMMON_SRCS) \ @@ -57,18 +57,18 @@ svcgssd_SOURCES = \ svcgssd_LDADD = \ ../../support/nfs/libnfs.a \ - $(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(LIBNFSIDMAP) \ + $(RPCSECGSS_LIBS) $(LIBNFSIDMAP) \ $(KRBLIBS) $(LIBTIRPC) svcgssd_LDFLAGS = $(KRBLDFLAGS) svcgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \ - $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS) + $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) gss_clnt_send_err_SOURCES = gss_clnt_send_err.c gss_clnt_send_err_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \ - $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS) + $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) MAINTAINERCLEANFILES = Makefile.in |