diff options
| author | Steve Dickson <steved@redhat.com> | 2014-09-22 16:35:20 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2014-09-25 15:30:44 -0400 |
| commit | c59301841b5ab644a85c2806f9231a9a2886b031 (patch) | |
| tree | f0917c42203d262595ee9f5c31dd0966285fce91 | |
| parent | 2d9ea45bdbaf8bd78ce34b99480df548d367082d (diff) | |
| download | nfs-utils-c59301841b5ab644a85c2806f9231a9a2886b031.tar.gz nfs-utils-c59301841b5ab644a85c2806f9231a9a2886b031.tar.xz nfs-utils-c59301841b5ab644a85c2806f9231a9a2886b031.zip | |
rpc.svcgssd: Add a configure switch to disable building the daemon
Now that gssproxy is supported on modern kernels,
the svcgssd is no longer needed. This switch
disables the building of the daemon.
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | configure.ac | 23 | ||||
| -rw-r--r-- | utils/gssd/Makefile.am | 11 |
2 files changed, 28 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index bc48373..78a5d65 100644 --- a/configure.ac +++ b/configure.ac @@ -90,21 +90,36 @@ AC_ARG_ENABLE(nfsv41, AC_ARG_ENABLE(gss, [AC_HELP_STRING([--enable-gss], - [enable support for rpcsec_gss @<:@default=yes@:>@])], + [enable client support for rpcsec_gss @<:@default=yes@:>@])], enable_gss=$enableval, enable_gss=yes) if test "$enable_gss" = yes; then GSSD=gssd - SVCGSSD=svcgssd else enable_gss= GSSD= - SVCGSSD= fi AC_SUBST(GSSD) - AC_SUBST(SVCGSSD) AC_SUBST(enable_gss) AM_CONDITIONAL(CONFIG_GSS, [test "$enable_gss" = "yes"]) + +AC_ARG_ENABLE(svcgss, + [AC_HELP_STRING([--enable-svcgss], + [enable building svcgssd for rpcsec_gss server support @<:@default=yes@:>@])], + enable_svcgss=$enableval, + enable_svcgss=yes) + if test "$enable_gss" = yes; then + if "enable_svcgss" = yes; then + SVCGSSD=svcgssd + fi + else + enable_svcgss= + SVCGSSD= + fi + AC_SUBST(SVCGSSD) + AC_SUBST(enable_svcgss) + AM_CONDITIONAL(CONFIG_SVCGSS, [test "$enable_svcgss" = "yes"]) + AC_ARG_ENABLE(kprefix, [AC_HELP_STRING([--enable-kprefix], [install progs as rpc.knfsd etc])], test "$enableval" = "yes" && kprefix=k, diff --git a/utils/gssd/Makefile.am b/utils/gssd/Makefile.am index af59791..9835117 100644 --- a/utils/gssd/Makefile.am +++ b/utils/gssd/Makefile.am @@ -1,10 +1,17 @@ ## Process this file with automake to produce Makefile.in -man8_MANS = gssd.man svcgssd.man +man8_MANS = gssd.man +if CONFIG_SVCGSS +man8_MANS += svcgssd.man +endif RPCPREFIX = rpc. KPREFIX = @kprefix@ -sbin_PREFIXED = gssd svcgssd +sbin_PREFIXED = gssd +if CONFIG_SVCGSS +sbin_PREFIXED += svcgssd +endif + sbin_PROGRAMS = $(sbin_PREFIXED) EXTRA_DIST = \ |