Merge pull request #188 from DavidMulder/disable_afs
--disable-afs-support doesn't really disable afs
This commit is contained in:
@@ -240,6 +240,7 @@ AC_ARG_ENABLE([afs-support],
|
|||||||
if test "$enable_afs_support" = no; then
|
if test "$enable_afs_support" = no; then
|
||||||
AC_DEFINE(NO_AFS, 1, [Define if you don't wan't support for AFS.])
|
AC_DEFINE(NO_AFS, 1, [Define if you don't wan't support for AFS.])
|
||||||
NO_AFS="1"
|
NO_AFS="1"
|
||||||
|
AM_CONDITIONAL(HAVE_AFS, 0)
|
||||||
fi
|
fi
|
||||||
AC_SUBST(NO_AFS)dnl
|
AC_SUBST(NO_AFS)dnl
|
||||||
|
|
||||||
|
@@ -2,6 +2,10 @@
|
|||||||
|
|
||||||
include $(top_srcdir)/Makefile.am.common
|
include $(top_srcdir)/Makefile.am.common
|
||||||
|
|
||||||
|
if HAVE_AFS
|
||||||
|
afs_lib = $(LIB_kafs)
|
||||||
|
endif
|
||||||
|
|
||||||
AM_CPPFLAGS += -I$(srcdir)/../lib/krb5 \
|
AM_CPPFLAGS += -I$(srcdir)/../lib/krb5 \
|
||||||
$(INCLUDE_libintl) \
|
$(INCLUDE_libintl) \
|
||||||
-DHEIMDAL_LOCALEDIR='"$(localedir)"'
|
-DHEIMDAL_LOCALEDIR='"$(localedir)"'
|
||||||
@@ -21,7 +25,7 @@ libexec_PROGRAMS = kdigest kimpersonate
|
|||||||
noinst_PROGRAMS = kverify kdecode_ticket generate-requests
|
noinst_PROGRAMS = kverify kdecode_ticket generate-requests
|
||||||
|
|
||||||
kinit_LDADD = \
|
kinit_LDADD = \
|
||||||
$(LIB_kafs) \
|
$(afs_lib) \
|
||||||
$(top_builddir)/lib/krb5/libkrb5.la \
|
$(top_builddir)/lib/krb5/libkrb5.la \
|
||||||
$(top_builddir)/lib/ntlm/libheimntlm.la \
|
$(top_builddir)/lib/ntlm/libheimntlm.la \
|
||||||
$(LIB_hcrypto) \
|
$(LIB_hcrypto) \
|
||||||
|
@@ -20,6 +20,9 @@ endif
|
|||||||
if MAINTAINER_MODE
|
if MAINTAINER_MODE
|
||||||
dir_sqlite = sqlite
|
dir_sqlite = sqlite
|
||||||
endif
|
endif
|
||||||
|
if HAVE_AFS
|
||||||
|
dir_afs = kafs
|
||||||
|
endif
|
||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
roken \
|
roken \
|
||||||
@@ -36,7 +39,7 @@ SUBDIRS = \
|
|||||||
hx509 \
|
hx509 \
|
||||||
krb5 \
|
krb5 \
|
||||||
ntlm \
|
ntlm \
|
||||||
kafs \
|
$(dir_afs) \
|
||||||
gssapi \
|
gssapi \
|
||||||
hdb \
|
hdb \
|
||||||
kadm5 \
|
kadm5 \
|
||||||
|
Reference in New Issue
Block a user