* .Sanitize (Things-to-keep): Add Makefile

	* Makefile: Simple file to build both dvi and info versions of
		install and allow for easy cleaning.

	* install.texi (Options to Configure): Updated to reflect current
		major configuration options.

I have not documented that kdb4 and dbm database options.

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

3 files changed, 62 insertions, 4 deletions

diff --git a/doc/.Sanitize b/doc/.Sanitize
index fda7567bf..89b441370 100644
--- a/doc/.Sanitize
+++ b/doc/.Sanitize
@@ -26,6 +26,7 @@ Things-to-keep:
 ChangeLog
 HOW_TO_BUILD
 INCOMPATIBILITY
+Makefile
 OS-notes
 SOURCE-TREE
 TREE-GRAPH
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 678f82ebb..ef7d884c5 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,13 @@
+Tue Oct 17 19:23:50 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+	* .Sanitize (Things-to-keep): Add Makefile
+
+	* Makefile: Simple file to build both dvi and info versions of
+		install and allow for easy cleaning.
+
+	* install.texi (Options to Configure): Updated to reflect current
+		major configuration options.
+
 Wed Oct 11 16:20:58 1995  Ezra Peisach  (epeisach@kangaroo.mit.edu)
 
 	* install.texi: Remove config.h descriptions, describe krb5.conf. 
diff --git a/doc/install.texi b/doc/install.texi
index c07b64528..7b53f9f6a 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -577,6 +577,17 @@ program.
 
 @table @code
 
+@item --prefix=DIR
+
+By default, Kerberos will install the package's files rooted at
+`/usr/local' as in `/usr/local/bin', `/usr/local/sbin', etc. If you
+desire a different location use this option.
+
+@item --exec-prefix=DIR
+
+This option allows one to separate the architecture independent programs
+from the configuration files and manual pages. 
+
 @item --with-cc=COMPILER
 
 Use @code{COMPILER} as the C compiler.
@@ -596,10 +607,20 @@ Use @code{CPPOPTS} as the default set of C preprocessor flags.  The most
 common use of this option is to select certain @code{#define}'s for use
 with the operating system's include files.
 
-@item --with-krb5-root=DIR
+@item --with-linker=LINKER
+
+Use @code{LINKER} as the default loader if it should be different from C
+compiler as specified above.
 
-By default, Kerberos will expect its configuration files to be in
-the directory @file{/krb5}.  Change it with this option.
+@item --with-ldopts=LDOPTS
+
+This option allows one to specify optional arguments to be passed to the
+linker. This might be used to specify optional library paths.
+
+@item  --with-krb4
+
+This option enables Kerberos V4 backwards compatibility using the
+builtin Kerberos V4 library.
 
 @item  --with-krb4=KRB4DIR 
 
@@ -608,6 +629,33 @@ specified by @code{KRB4DIR} specifies where the V4 header files should
 be found (@file{/KRB4DIR/include}) as well as where the V4 Kerberos
 library should be found (@file{/KRB4DIR/lib}).
 
+@item  --without-krb4
+
+Disables Kerberos V4 backwards compatibility. This prevents Kerberos V4
+clients from using the V5 services including the KDC. This would be
+useful if you know you will never install or need to interact with V4
+clients. 
+
+@item --with-netlib[=libs]
+
+Allows for suppression of or replacement of network libraries. By
+default, Kerberos V5 configuration will look for @code{-lnsl} and
+@code{-lsocket}. If your operating system has a broken resolver library
+@xref{Solaris versions 2.0 through 2.3} or fails to pass the tests in
+@file{src/tests/resolv} you will need to use this option.
+
+@item --enable-shared
+
+This option will turn on the building and use of shared library objects
+in the Kerberos build. This option is only supported on certain
+platforms. 
+
+@item --enable-athena
+
+Was used to setup configuration files in such a way as to be compatible
+with the Athena environment at MIT. It currently does not appear to do
+anything useful.
+
 @item --with-vague-errors
 
 If enabled, gives vague and unhelpful error messages to the client... er,
@@ -622,7 +670,6 @@ well as the failure count information.  Note that this doesn't work if
 you're using slave servers!!!  It also causes the database to be
 modified (and thus needing to be locked) frequently.
 
-
 @end table
 
 For example, in order to configure Kerberos on a Solaris machine using