mirror of
https://git.openafs.org/openafs.git
synced 2025-01-31 05:27:44 +00:00
Add configure option to not install kauth
Per http://www.openafs.org/pages/no-more-des.html the kaserver suite of utilities is deprecated and is not supposed to be built anymore in this post-1.6 world. Not building them at all requires some effort, but not installing them is pretty easy. Do the easy part for now, and leave the hard parts for a follow-up commit. Change-Id: I1c400a7398b8708e7c9dc6613cd183b9b67e7a7f Reviewed-on: http://gerrit.openafs.org/8457 Reviewed-by: Michael Laß <lass@mail.uni-paderborn.de> Reviewed-by: Derrick Brashear <shadow@your-file-system.com> Tested-by: BuildBot <buildbot@rampaginggeek.com>
This commit is contained in:
Ben Kaduk
Jeffrey Altman
parent
752514bd1c
commit
5afe7a882b
15
acinclude.m4
15
acinclude.m4
@ -162,6 +162,14 @@ AC_ARG_ENABLE([transarc-paths],
|
||||
,
|
||||
[enable_transarc_paths="no"])
|
||||
|
||||
dnl Deprecated crypto
|
||||
AC_ARG_ENABLE([kauth],
|
||||
[AS_HELP_STRING([--disable-kauth],
|
||||
[do not install the deprecated kauth server and utilities (defaults to
|
||||
enabled)])],
|
||||
,
|
||||
[enable_kauth="yes"])
|
||||
|
||||
dnl Optimization and debugging flags.
|
||||
AC_ARG_ENABLE([strip-binaries],
|
||||
[AS_HELP_STRING([--disable-strip-binaries],
|
||||
@ -1453,6 +1461,13 @@ else
|
||||
fi
|
||||
AC_SUBST(BUILD_USS)
|
||||
|
||||
if test "$enable_kauth" = yes; then
|
||||
INSTALL_KAUTH="yes"
|
||||
else
|
||||
INSTALL_KAUTH="no"
|
||||
fi
|
||||
AC_SUBST(INSTALL_KAUTH)
|
||||
|
||||
AC_CHECK_FUNCS([ \
|
||||
arc4random \
|
||||
fcntl \
|
||||
|
||||
@ -24,6 +24,8 @@ LT_deps = $(top_builddir)/src/ubik/liboafs_ubik.la \
|
||||
$(top_builddir)/src/rxkad/liboafs_rxkad.la
|
||||
LT_libs =
|
||||
|
||||
INSTALL_KAUTH = @INSTALL_KAUTH@
|
||||
|
||||
INCLS=${TOP_INCDIR}/ubik.h \
|
||||
${TOP_INCDIR}/lwp.h \
|
||||
${TOP_INCDIR}/lock.h \
|
||||
@ -248,62 +250,66 @@ rebuild: rebuild.o $(LIBS) libkauth.a
|
||||
install: kaserver kas kpwvalid kas klog klog.krb knfs kpasswd libkauth.a \
|
||||
libkauth.krb.a rebuild kdb ka-forwarder kautils.h kauth.h \
|
||||
kaport.h
|
||||
${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
|
||||
${INSTALL} -d ${DESTDIR}${bindir}
|
||||
${INSTALL} -d ${DESTDIR}${sbindir}
|
||||
${INSTALL} -d ${DESTDIR}${afssrvbindir}
|
||||
${INSTALL} -d ${DESTDIR}${afssrvsbindir}
|
||||
${INSTALL} -d ${DESTDIR}${libdir}/afs
|
||||
${INSTALL} -d ${DESTDIR}${includedir}/afs
|
||||
${INSTALL_PROGRAM} kaserver ${DESTDIR}${afssrvlibexecdir}/kaserver
|
||||
${INSTALL_PROGRAM} kas ${DESTDIR}${sbindir}/kas
|
||||
${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${sbindir}/kpwvalid
|
||||
${INSTALL_PROGRAM} kas ${DESTDIR}${afssrvsbindir}/kas
|
||||
${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${afssrvsbindir}/kpwvalid
|
||||
${INSTALL_PROGRAM} klog ${DESTDIR}${bindir}/klog
|
||||
${INSTALL_PROGRAM} klog.krb ${DESTDIR}${bindir}/klog.krb
|
||||
${INSTALL_PROGRAM} klog ${DESTDIR}${afssrvbindir}/klog
|
||||
${INSTALL_PROGRAM} klog.krb ${DESTDIR}${afssrvbindir}/klog.krb
|
||||
${INSTALL_PROGRAM} knfs ${DESTDIR}${bindir}/knfs
|
||||
${INSTALL_PROGRAM} kpasswd ${DESTDIR}${bindir}/kpasswd
|
||||
${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${bindir}/kpwvalid
|
||||
${INSTALL_DATA} libkauth.a ${DESTDIR}${libdir}/afs/libkauth.a
|
||||
${INSTALL_DATA} libkauth.krb.a ${DESTDIR}${libdir}/afs/libkauth.krb.a
|
||||
${INSTALL_PROGRAM} rebuild ${DESTDIR}${afssrvsbindir}/kadb_check
|
||||
${INSTALL_PROGRAM} kdb ${DESTDIR}${afssrvsbindir}/kdb
|
||||
${INSTALL_PROGRAM} ka-forwarder ${DESTDIR}${afssrvsbindir}/ka-forwarder
|
||||
${INSTALL_DATA} kautils.h ${DESTDIR}${includedir}/afs/kautils.h
|
||||
${INSTALL_DATA} kauth.h ${DESTDIR}${includedir}/afs/kauth.h
|
||||
${INSTALL_DATA} ${srcdir}/kaport.h ${DESTDIR}${includedir}/afs/kaport.h
|
||||
if [ "x${INSTALL_KAUTH}" = "xyes" ]; then \
|
||||
${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}; \
|
||||
${INSTALL} -d ${DESTDIR}${bindir}; \
|
||||
${INSTALL} -d ${DESTDIR}${sbindir}; \
|
||||
${INSTALL} -d ${DESTDIR}${afssrvbindir}; \
|
||||
${INSTALL} -d ${DESTDIR}${afssrvsbindir}; \
|
||||
${INSTALL} -d ${DESTDIR}${libdir}/afs; \
|
||||
${INSTALL} -d ${DESTDIR}${includedir}/afs; \
|
||||
${INSTALL_PROGRAM} kaserver ${DESTDIR}${afssrvlibexecdir}/kaserver; \
|
||||
${INSTALL_PROGRAM} kas ${DESTDIR}${sbindir}/kas; \
|
||||
${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${sbindir}/kpwvalid; \
|
||||
${INSTALL_PROGRAM} kas ${DESTDIR}${afssrvsbindir}/kas; \
|
||||
${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${afssrvsbindir}/kpwvalid; \
|
||||
${INSTALL_PROGRAM} klog ${DESTDIR}${bindir}/klog; \
|
||||
${INSTALL_PROGRAM} klog.krb ${DESTDIR}${bindir}/klog.krb; \
|
||||
${INSTALL_PROGRAM} klog ${DESTDIR}${afssrvbindir}/klog; \
|
||||
${INSTALL_PROGRAM} klog.krb ${DESTDIR}${afssrvbindir}/klog.krb; \
|
||||
${INSTALL_PROGRAM} knfs ${DESTDIR}${bindir}/knfs; \
|
||||
${INSTALL_PROGRAM} kpasswd ${DESTDIR}${bindir}/kpasswd; \
|
||||
${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${bindir}/kpwvalid; \
|
||||
${INSTALL_DATA} libkauth.a ${DESTDIR}${libdir}/afs/libkauth.a; \
|
||||
${INSTALL_DATA} libkauth.krb.a ${DESTDIR}${libdir}/afs/libkauth.krb.a; \
|
||||
${INSTALL_PROGRAM} rebuild ${DESTDIR}${afssrvsbindir}/kadb_check; \
|
||||
${INSTALL_PROGRAM} kdb ${DESTDIR}${afssrvsbindir}/kdb; \
|
||||
${INSTALL_PROGRAM} ka-forwarder ${DESTDIR}${afssrvsbindir}/ka-forwarder; \
|
||||
${INSTALL_DATA} kautils.h ${DESTDIR}${includedir}/afs/kautils.h; \
|
||||
${INSTALL_DATA} kauth.h ${DESTDIR}${includedir}/afs/kauth.h; \
|
||||
${INSTALL_DATA} ${srcdir}/kaport.h ${DESTDIR}${includedir}/afs/kaport.h; \
|
||||
fi
|
||||
|
||||
dest: kaserver kas kpwvalid kas klog klog.krb knfs kpasswd libkauth.a \
|
||||
libkauth.krb.a rebuild kdb ka-forwarder kautils.h kauth.h \
|
||||
kaport.h
|
||||
${INSTALL} -d ${DEST}/root.server/usr/afs/bin
|
||||
${INSTALL} -d ${DEST}/etc
|
||||
${INSTALL} -d ${DEST}/bin
|
||||
${INSTALL} -d ${DEST}/lib/afs
|
||||
${INSTALL} -d ${DEST}/include/afs
|
||||
${INSTALL_PROGRAM} kaserver ${DEST}/root.server/usr/afs/bin/kaserver
|
||||
${INSTALL_PROGRAM} kas ${DEST}/etc/kas
|
||||
${INSTALL_PROGRAM} kpwvalid ${DEST}/etc/kpwvalid
|
||||
${INSTALL_PROGRAM} kas ${DEST}/root.server/usr/afs/bin/kas
|
||||
${INSTALL_PROGRAM} kpwvalid ${DEST}/root.server/usr/afs/bin/kpwvalid
|
||||
${INSTALL_PROGRAM} klog ${DEST}/bin/klog
|
||||
${INSTALL_PROGRAM} klog.krb ${DEST}/bin/klog.krb
|
||||
${INSTALL_PROGRAM} klog ${DEST}/root.server/usr/afs/bin/klog
|
||||
${INSTALL_PROGRAM} klog.krb ${DEST}/root.server/usr/afs/bin/klog.krb
|
||||
${INSTALL_PROGRAM} knfs ${DEST}/bin/knfs
|
||||
${INSTALL_PROGRAM} kpasswd ${DEST}/bin/kpasswd
|
||||
${INSTALL_PROGRAM} kpwvalid ${DEST}/bin/kpwvalid
|
||||
${INSTALL_DATA} libkauth.a ${DEST}/lib/afs/libkauth.a
|
||||
${INSTALL_DATA} libkauth.krb.a ${DEST}/lib/afs/libkauth.krb.a
|
||||
${INSTALL_PROGRAM} kdb ${DEST}/etc/kdb
|
||||
${INSTALL_PROGRAM} rebuild ${DEST}/etc/kadb_check
|
||||
${INSTALL_PROGRAM} ka-forwarder ${DEST}/root.server/usr/afs/bin/ka-forwarder
|
||||
${INSTALL_DATA} kautils.h ${DEST}/include/afs/kautils.h
|
||||
${INSTALL_DATA} kauth.h ${DEST}/include/afs/kauth.h
|
||||
${INSTALL_DATA} ${srcdir}/kaport.h ${DEST}/include/afs/kaport.h
|
||||
if [ "x${INSTALL_KAUTH}" = "xyes" ]; then \
|
||||
${INSTALL} -d ${DEST}/root.server/usr/afs/bin; \
|
||||
${INSTALL} -d ${DEST}/etc; \
|
||||
${INSTALL} -d ${DEST}/bin; \
|
||||
${INSTALL} -d ${DEST}/lib/afs; \
|
||||
${INSTALL} -d ${DEST}/include/afs; \
|
||||
${INSTALL_PROGRAM} kaserver ${DEST}/root.server/usr/afs/bin/kaserver; \
|
||||
${INSTALL_PROGRAM} kas ${DEST}/etc/kas; \
|
||||
${INSTALL_PROGRAM} kpwvalid ${DEST}/etc/kpwvalid; \
|
||||
${INSTALL_PROGRAM} kas ${DEST}/root.server/usr/afs/bin/kas; \
|
||||
${INSTALL_PROGRAM} kpwvalid ${DEST}/root.server/usr/afs/bin/kpwvalid; \
|
||||
${INSTALL_PROGRAM} klog ${DEST}/bin/klog; \
|
||||
${INSTALL_PROGRAM} klog.krb ${DEST}/bin/klog.krb; \
|
||||
${INSTALL_PROGRAM} klog ${DEST}/root.server/usr/afs/bin/klog; \
|
||||
${INSTALL_PROGRAM} klog.krb ${DEST}/root.server/usr/afs/bin/klog.krb; \
|
||||
${INSTALL_PROGRAM} knfs ${DEST}/bin/knfs; \
|
||||
${INSTALL_PROGRAM} kpasswd ${DEST}/bin/kpasswd; \
|
||||
${INSTALL_PROGRAM} kpwvalid ${DEST}/bin/kpwvalid; \
|
||||
${INSTALL_DATA} libkauth.a ${DEST}/lib/afs/libkauth.a; \
|
||||
${INSTALL_DATA} libkauth.krb.a ${DEST}/lib/afs/libkauth.krb.a; \
|
||||
${INSTALL_PROGRAM} kdb ${DEST}/etc/kdb; \
|
||||
${INSTALL_PROGRAM} rebuild ${DEST}/etc/kadb_check; \
|
||||
${INSTALL_PROGRAM} ka-forwarder ${DEST}/root.server/usr/afs/bin/ka-forwarder; \
|
||||
${INSTALL_DATA} kautils.h ${DEST}/include/afs/kautils.h; \
|
||||
${INSTALL_DATA} kauth.h ${DEST}/include/afs/kauth.h; \
|
||||
${INSTALL_DATA} ${srcdir}/kaport.h ${DEST}/include/afs/kaport.h; \
|
||||
fi
|
||||
|
||||
#
|
||||
# Misc. targets
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user