summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2013-03-26 11:11:41 -0400
committerSimo Sorce <simo@redhat.com>2013-03-26 12:15:19 -0400
commitdf16cc255bf2d208a61c7d9810e3be6685b697a6 (patch)
tree559b135388fa1fde8a76f6c3fbb8426a4c72ecc3 /utils
parente79baddaa1d8cf24cce929e14f6f91ac0d5e15d0 (diff)
downloadnfs-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 'utils')
-rw-r--r--utils/gssd/Makefile.am12
1 files changed, 6 insertions, 6 deletions
diff --git a/utils/gssd/Makefile.am b/utils/gssd/Makefile.am
index 2365704..a300da2 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) $(GSSAPI_LIBS)
gssd_LDFLAGS = $(KRBLDFLAGS) $(LIBTIRPC)
gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
- $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
+ $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS)
svcgssd_SOURCES = \
$(COMMON_SRCS) \
@@ -57,18 +57,18 @@ svcgssd_SOURCES = \
svcgssd_LDADD = \
../../support/nfs/libnfs.a \
- $(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(LIBNFSIDMAP) \
- $(KRBLIBS) $(LIBTIRPC)
+ $(RPCSECGSS_LIBS) $(LIBNFSIDMAP) \
+ $(KRBLIBS) $(GSSAPI_LIBS) $(LIBTIRPC)
svcgssd_LDFLAGS = $(KRBLDFLAGS)
svcgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
- $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
+ $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS)
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) $(GSSAPI_CFLAGS)
MAINTAINERCLEANFILES = Makefile.in