From e35ab3c3e707c11f357bfc75f983572dc4b8e871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Tue, 18 Mar 2003 04:20:08 +0000
Subject: [PATCH] always build the libkafs library now that the kerberos 5 can
 stand on their own

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11841 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/kafs/Makefile.am | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/lib/kafs/Makefile.am b/lib/kafs/Makefile.am
index bac02c91c..11bd95791 100644
--- a/lib/kafs/Makefile.am
+++ b/lib/kafs/Makefile.am
@@ -2,11 +2,20 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-INCLUDES += $(INCLUDE_krb4) $(AFS_EXTRA_DEFS) $(ROKEN_RENAME)
+INCLUDES += $(INCLUDE_krb4) $(AFS_EXTRA_DEFS) $(ROKEN_RENAME) -I$(top_srcdir)/lib/krb5
 
 if KRB4
-AFSLIBS = libkafs.la
 DEPLIB_krb4 = $(LIB_krb4) $(LIB_des)
+else
+DEPLIB_krb4  =
+endif # KRB4
+
+if KRB5
+DEPLIB_krb5 = ../krb5/libkrb5.la 
+else
+DEPLIB_krb5  =
+endif # KRB5
+
 
 if AIX
 AFSL_EXP = $(srcdir)/afsl.exp
@@ -36,18 +45,9 @@ AFSL_EXP =
 AIX_SRC =
 endif # AIX
 
-else
-AFSLIBS = 
-DEPLIB_krb4  =
-endif # KRB4
+libkafs_la_LIBADD = $(DEPLIB_krb5) ../roken/libroken.la $(DEPLIB_krb4)
 
-if KRB5
-libkafs_la_LIBADD = ../krb5/libkrb5.la ../roken/libroken.la $(DEPLIB_krb4)
-else
-libkafs_la_LIBADD = ../roken/libroken.la $(DEPLIB_krb4)
-endif # KRB5
-
-lib_LTLIBRARIES = $(AFSLIBS)
+lib_LTLIBRARIES = libkafs.la
 libkafs_la_LDFLAGS = -version-info 3:4:3
 foodir = $(libdir)
 foo_DATA = $(AFS_EXTRA_LIBS)
@@ -61,13 +61,18 @@ if KRB5
 afskrb5_c = afskrb5.c
 endif
 
+if KRB4
+afskrb_c = afskrb.c
+endif
+
+
 if do_roken_rename
 ROKEN_SRCS = resolve.c strtok_r.c strlcpy.c strsep.c
 endif
 
 libkafs_la_SOURCES =				\
 	afssys.c				\
-	afskrb.c				\
+	$(afskrb_c)				\
 	$(afskrb5_c)				\
 	common.c				\
 	$(AIX_SRC)				\
@@ -77,7 +82,7 @@ libkafs_la_SOURCES =				\
 
 #afslib_so_SOURCES = afslib.c
 
-EXTRA_libkafs_la_SOURCES = afskrb5.c dlfcn.c afslib.c dlfcn.h
+EXTRA_libkafs_la_SOURCES = afskrb.c afskrb5.c dlfcn.c afslib.c dlfcn.h
 
 EXTRA_DIST = README.dlfcn afsl.exp afslib.exp