Skip to content

Commit

Permalink
Merge pull request #188 from DavidMulder/disable_afs
Browse files Browse the repository at this point in the history
--disable-afs-support doesn't really disable afs
  • Loading branch information
jaltman committed Aug 2, 2016
2 parents c7ed0b7 + d808016 commit f0f24fd
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions configure.ac
Expand Up @@ -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

Expand Down
6 changes: 5 additions & 1 deletion kuser/Makefile.am
Expand Up @@ -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)"'
Expand All @@ -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) \
Expand Down
5 changes: 4 additions & 1 deletion lib/Makefile.am
Expand Up @@ -20,6 +20,9 @@ endif
if MAINTAINER_MODE
dir_sqlite = sqlite
endif
if HAVE_AFS
dir_afs = kafs
endif

SUBDIRS = \
roken \
Expand All @@ -36,7 +39,7 @@ SUBDIRS = \
hx509 \
krb5 \
ntlm \
kafs \
$(dir_afs) \
gssapi \
hdb \
kadm5 \
Expand Down

0 comments on commit f0f24fd

Please sign in to comment.