Merge pull request #188 from DavidMulder/disable_afs

--disable-afs-support doesn't really disable afs
This commit is contained in:
Jeffrey Altman
2016-08-02 16:50:15 -04:00
committed by GitHub
3 changed files with 10 additions and 2 deletions

View File

@@ -240,6 +240,7 @@ AC_ARG_ENABLE([afs-support],
if test "$enable_afs_support" = no; then
AC_DEFINE(NO_AFS, 1, [Define if you don't wan't support for AFS.])
NO_AFS="1"
AM_CONDITIONAL(HAVE_AFS, 0)
fi
AC_SUBST(NO_AFS)dnl

View File

@@ -2,6 +2,10 @@
include $(top_srcdir)/Makefile.am.common
if HAVE_AFS
afs_lib = $(LIB_kafs)
endif
AM_CPPFLAGS += -I$(srcdir)/../lib/krb5 \
$(INCLUDE_libintl) \
-DHEIMDAL_LOCALEDIR='"$(localedir)"'
@@ -21,7 +25,7 @@ libexec_PROGRAMS = kdigest kimpersonate
noinst_PROGRAMS = kverify kdecode_ticket generate-requests
kinit_LDADD = \
$(LIB_kafs) \
$(afs_lib) \
$(top_builddir)/lib/krb5/libkrb5.la \
$(top_builddir)/lib/ntlm/libheimntlm.la \
$(LIB_hcrypto) \

View File

@@ -20,6 +20,9 @@ endif
if MAINTAINER_MODE
dir_sqlite = sqlite
endif
if HAVE_AFS
dir_afs = kafs
endif
SUBDIRS = \
roken \
@@ -36,7 +39,7 @@ SUBDIRS = \
hx509 \
krb5 \
ntlm \
kafs \
$(dir_afs) \
gssapi \
hdb \
kadm5 \