Makefile.in: include krb5/ccache/memory and windows/lib in the list of

	directories built by the Windows build.  When building kerbsrc-nt.zip,
	put a copy of mkbin.bat in the top-level build directory.  Fix bug in
	kerbsrc-nt.zip building where it wasn't creating the initial Makefile
	(although the dos-zipfiles target did the right thing).

aclocal.m4 (KRB5_LIB_PARAMS): Remove "untested" comment from freebsd.
	Add section for openbsd.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10588 dc483132-0cff-0310-8789-dd5450dbe970

3 files changed, 39 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b47bf1eb0..df3973d91 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+1998-05-27  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: include krb5/ccache/memory and windows/lib in
+		the list of directories built by the Windows build.
+		When building kerbsrc-nt.zip, put a copy of mkbin.bat
+		in the top-level build directory.  Fix bug in
+		kerbsrc-nt.zip building where it wasn't creating the
+		initial Makefile (although the dos-zipfiles target did
+		the right thing).
+
+1998-05-26  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* aclocal.m4 (KRB5_LIB_PARAMS): Remove "untested" comment from
+		freebsd.  Add section for openbsd.
+
 Sun May 24 22:09:12 1998  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* Makefile.in: Remove lib/kadm and lib/krb5/free from the list of
diff --git a/src/Makefile.in b/src/Makefile.in
index 9867ff7a1..6d9260eff 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -140,6 +140,7 @@ config-windows:: makefile-windows
 ##DOS##		lib\krb5\asn.1\makefile lib\krb5\ccache\makefile \
 ##DOS##		lib\krb5\ccache\file\makefile \
 ##DOS##		lib\krb5\ccache\stdio\makefile \
+##DOS##		lib\krb5\ccache\memory\makefile \
 ##DOS##		lib\krb5\error_tables\makefile \
 ##DOS##		lib\krb5\keytab\makefile \
 ##DOS##		lib\krb5\keytab\file\makefile lib\krb5\krb\makefile \
@@ -147,7 +148,7 @@ config-windows:: makefile-windows
 ##DOS##		lib\krb5\rcache\makefile \
 ##DOS##		util\et\makefile util\profile\makefile \
 ##DOS##		util\windows\makefile \
-##DOS##		windows\Makefile \
+##DOS##		windows\Makefile windows\lib\Makefile \
 ##DOS##		windows\cns\Makefile windows\gina\Makefile \
 ##DOS##		windows\gss\Makefile windows\wintel\Makefile
 ##DOS##	config\rm.bat wconfig.obj msvc.pdb
@@ -204,6 +205,8 @@ config-windows:: makefile-windows
 ##DOS##	$(WCONFIG) config < $@.in > $@
 ##DOS##lib\krb5\ccache\stdio\makefile: lib\krb5\ccache\stdio\makefile.in $(MKFDEP)
 ##DOS##	$(WCONFIG) config < $@.in > $@
+##DOS##lib\krb5\ccache\memory\makefile: lib\krb5\ccache\memory\makefile.in $(MKFDEP)
+##DOS##	$(WCONFIG) config < $@.in > $@
 ##DOS##lib\krb5\error_tables\makefile: lib\krb5\error_tables\makefile.in $(MKFDEP)
 ##DOS##	$(WCONFIG) config < $@.in > $@
 ##DOS##lib\krb5\keytab\makefile: lib\krb5\keytab\makefile.in $(MKFDEP)
@@ -226,6 +229,8 @@ config-windows:: makefile-windows
 ##DOS##	$(WCONFIG) config < $@.in > $@
 ##DOS##windows\Makefile:  windows\Makefile.in $(MKFDEP)
 ##DOS##	$(WCONFIG) config < $@.in > $@
+##DOS##windows\lib\Makefile:  windows\lib\Makefile.in $(MKFDEP)
+##DOS##	$(WCONFIG) config < $@.in > $@
 ##DOS##windows\cns\Makefile:  windows\cns\Makefile.in $(MKFDEP)
 ##DOS##	$(WCONFIG) config < $@.in > $@
 ##DOS##windows\gina\Makefile:  windows\gina\Makefile.in $(MKFDEP)
@@ -279,14 +284,14 @@ FILES= ./* \
 	lib/des425/* lib/gssapi/* lib/gssapi/generic/* lib/gssapi/krb5/* \
 	lib/gssapi/mechglue/* lib/krb4/* \
 	lib/krb5/* lib/krb5/asn.1/* lib/krb5/krb/* \
-	lib/krb5/ccache/* lib/krb5/ccache/file/* \
+	lib/krb5/ccache/* lib/krb5/ccache/file/* lib/krb5/ccache/memory/* \
 	lib/krb5/ccache/stdio/* lib/krb5/error_tables/* \
 	lib/krb5/keytab/* lib/krb5/keytab/file/* \
 	lib/krb5/os/* lib/krb5/posix/* lib/krb5/rcache/* \
 	util/et/* util/profile/*
 
-WINFILES= util/windows/* \
-	windows/* windows/cns/* windows/wintel/* windows/gss/* windows/gina/*
+WINFILES= util/windows/* windows/* windows/lib/* windows/cns/* \
+	windows/wintel/* windows/gss/* windows/gina/*
 
 MACFILES= mac/* mac/kconfig/* mac/libraries/* mac/telnet-k5-auth/* \
 	mac/gss-sample/* mac/SAP/* config/* include/* \
@@ -325,7 +330,7 @@ HOUT =	$(INC)krb5.h $(GG)gssapi.h $(PR)profile.h
 
 CLEANUP= Makefile $(ETOUT) $(HOUT) \
 	include/profile.h include/krb5/osconf.h \
-	winfile.list macfile.list
+	winfile.list macfile.list mkbin.bat
 
 
 kerbsrc.win: kerbsrc.zip
@@ -347,6 +352,7 @@ macfile.list:
 dos-Makefile:
 	cat config/windows.in Makefile.in config/win-post.in | \
 		sed -e 's/^##DOS##//' -e 's/^##DOS//' > Makefile
+	cp windows/mkbin.bat .
 
 kerbsrc.zip: dos-Makefile awk-windows-mac winfile.list
 	rm -f kerbsrc.zip
@@ -357,7 +363,7 @@ kerbsrc.zip: dos-Makefile awk-windows-mac winfile.list
 	fi
 	rm -f $(CLEANUP)
 
-kerbsrc-nt.zip: awk-windows-mac winfile.list
+kerbsrc-nt.zip: dos-Makefile awk-windows-mac winfile.list
 	rm -f kerbsrc-nt.zip
 	$(ZIP) -Dl kerbsrc-nt.zip `cat winfile.list`
 	$(ZIP) -D kerbsrc-nt.zip $(WINBINARYFILES)
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 3371e8ba5..e98602e88 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1067,7 +1067,6 @@ mips-*-netbsd*)
 	PROFFLAGS=-pg
 	;;
 
-# untested...
 *-*-freebsd*)
 	PICFLAGS=-fpic
 	SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
@@ -1080,6 +1079,18 @@ mips-*-netbsd*)
 	PROFFLAGS=-pg
 	;;
 
+*-*-openbsd*)
+	PICFLAGS=-fpic
+	SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+	SHLIBEXT=.so
+	LDCOMBINE='ld -Bshareable'
+	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
+	PROFFLAGS=-pg
+	;;
+
 *-*-solaris*)
 	if test "$GCC" = yes; then
 		PICFLAGS=-fpic