--- cygnus/src/ChangeLog	Tue Jul  1 14:04:35 1997
+++ kerbnet-1.2/ChangeLog	Tue May 27 21:54:50 1997
@@ -1,3 +1,34 @@
+Wed Jun 12 00:23:51 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in (makefile-windows): Build the makefiles for
+		windows/cns, windows/gss, and windows/wintel.  Add
+		definition of BUILDTOP when building for DOS, since it's
+		needed for $(RM) to work.  When creating ./Makefile under
+		Unix, run things through sed to strip out ##DOS from the
+		beginning of lines.
+
+Mon Jun 10 17:11:45 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* wconfig.c: Revamp program to make it more extensible.  Now will
+ 	 	uncomment lines that begin "##DOS##" as well as
+ 	 	"##WIN16##" or "##WIN32##", depending on whether we are
+	 	compiling on a Windows 16 or Windows 32 environment.
+		Also, we now perform this transformation on the windows.in
+	 	and win-post.in files as well.
+
+Fri Jun  7 17:39:45 1996  Theodore Y. Ts'o  <tytso@mit.edu>
+
+	* Makefile.in (makefile-windows): Use full directory
+		name "error_tables" when building under Windows so that
+		the build will work correctly under VFAT and NTFS
+		filesystems.  Build the "makefile" file so that it
+		includes config/win-post.in.
+
+Thu Jun  6 00:04:38 1996  Theodore Y. Ts'o  <tytso@mit.edu>
+
+	* Makefile.in (all-windows): Don't pass $(LIBCMD) on the command
+		line.  It's set in the windows.in prologue for all Makefiles anyway.
+
 Tue Apr 30 23:25:07 1996  Ken Raeburn  <raeburn@cygnus.com>
 
 	* Makefile.in (tgz-bin, pkgdir): New targets.
@@ -12,6 +43,42 @@
 
 	* aclocal.m4 (V5_USE_SHARED_LIB): Remove another dependency in the
 		executables on the build tree.
+
+Thu Jul 18 19:12:02 1996  Marc Horowitz  <marc@mit.edu>
+
+	* configure.in: $krb524 works with the admin system, now
+
+Tue Jul  9 14:32:14 1996  Marc Horowitz  <marc@mit.edu>
+
+	* aclocal.m4 (USE_ANAME, USE_KDB5_LIBRARY, KRB5_LIBRARIES): change
+ 	these macros so that db (as provided in util/db2) will *always* be
+ 	used.
+
+	* configure.in (CONFIG_DIRS): removed $kadminv4 and $krb524 for
+ 	now, since they don't work with the new admin system.  this needs
+ 	to be fixed.
+
+	* aclocal.m4 (WITH_KRB4): create new substituted variable
+ 	KRB4_INCLUDES, which is conditional on internal vs external vs no
+ 	krb4.
+	(USE_KADMCLNT_LIBRARY): added.
+	(KRB5_LIBRARIES): this macro didn't have any clue how to deal with
+ 	multiple executeables built in the same dir with different
+ 	libraries.  it does now, at least for what the admin system needs.
+	(V5_MAKE_SHARED_LIB): this macro currently uses the LIB_SUBDIRS
+ 	make var to find the directories to build the shared library in.
+  	This adds an optional fifth argument which is used in conjunction
+ 	with LIB_SUBDIRS for that purpose.  Now, both kadm5 libraries can
+ 	be built in the same directory.
+
+Tue May  7 22:56:46 1996  Marc Horowitz  <marc@mit.edu>
+
+	* aclocal.m4 (V5_AC_OUTPUT_MAKEFILE): add a second optional
+ 	argument to specify files besides Makefile.in which should be
+ 	configureified.
+	* aclocal.m4 (USE_KADM_LIBRARY): removed.
+	* aclocal.m4 (USE_KADMSRV_LIBRARY, USE_GSSRPC_LIBRARY,
+ 	USE_GSSAPI_LIBRARY, USE_DYN_LIBRARY, USE_DB_LIBRARY): added.
 
 Wed Apr 17 13:24:02 1996  Theodore Y. Ts'o  <tytso@mit.edu>