merge new-crypto branch

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5332 ec53bebd-3082-4978-b11e-865c3cabbd6b

lib/kafs/ChangeLog

@@ -1,7 +1,15 @@
+Tue Dec  1 14:45:15 1998  Johan Danielsson  <joda@hella.pdc.kth.se>
+
+	* Makefile.am: fix AIX linkage
+
 Sun Nov 22 10:40:44 1998  Assar Westerlund  <assar@sics.se>
 
 	* Makefile.in (WFLAGS): set
 
+Sat Nov 21 16:55:19 1998  Johan Danielsson  <joda@hella.pdc.kth.se>
+
+	* afskrb5.c: add homedir support
+
 Sun Sep  6 20:16:27 1998  Assar Westerlund  <assar@sics.se>
 
 	* add new functionality for specifying the homedir to krb_afslog

lib/kafs/Makefile.am

@@ -2,33 +2,60 @@
 
 AUTOMAKE_OPTIONS = no-dependencies foreign
 
-INCLUDES = -I$(top_builddir)/include $(INCLUDE_krb4) -DLIBDIR=\"$(libdir)\"
+INCLUDES = \
+	-I$(top_builddir)/include	\
+	$(INCLUDE_krb4)			\
+	-DLIBDIR=\"$(libdir)\"		\
+	$(AFS_EXTRA_DEFS)
 
 if KRB4
 AFSLIBS = libkafs.a
-if AIX
-AFS_EXTRA_LIBS = afslib.so
-else
-AFS_EXTRA_LIBS = 
-endif
 else
 AFSLIBS = 
-AFS_EXTRA_LIBS =
 endif
+
+if AIX
+AFSL_EXP = $(srcdir)/afsl.exp
+
+if AIX4
+AFS_EXTRA_LD = -bnoentry
+else
+AFS_EXTRA_LD = -e _nostart
+endif
+
+if AIX_DYNAMIC_AFS
+if HAVE_DLOPEN
+AIX_SRC = 
+else
+AIX_SRC = dlfcn.c
+endif
+AFS_EXTRA_LIBS = afslib.so
+AFS_EXTRA_DEFS =
+else
+AIX_SRC = afslib.c
+AFS_EXTRA_LIBS = 
+AFS_EXTRA_DEFS = -DSTATIC_AFS
+endif
+
+else
+AFSL_EXP =
+endif # AIX
+
+
 lib_LIBRARIES = $(AFSLIBS)
-foodir=$(libdir)
+foodir = $(libdir)
 foo_DATA = $(AFS_EXTRA_LIBS)
 EXTRA_DATA = afslib.so
 
 CLEANFILES= $(AFS_EXTRA_LIBS)
 
-libkafs_a_SOURCES = afssys.c afskrb.c afskrb5.c common.c
+libkafs_a_SOURCES = afssys.c afskrb.c afskrb5.c common.c $(AIX_SRC)
 #afslib_so_SOURCES = afslib.c
 
 
 # AIX: this almost works with gcc, but somehow it fails to use the
 # correct ld, use ld instead
 afslib.so: afslib.o
-	ld -o $@ -bM:SRE -bI:$(srcdir)/afsl.exp -bE:$(srcdir)/afslib.exp -bnoentry afslib.o -lc
+	ld -o $@ -bM:SRE -bI:$(srcdir)/afsl.exp -bE:$(srcdir)/afslib.exp $(AFS_EXTRA_LD) afslib.o -lc
 
 $(OBJECTS): ../../include/config.h