r8404: small upstream merges of appweb code

[bbaumbach/samba-autobuild/.git] / howto.txt

diff --git a/howto.txt b/howto.txt
index de315dadbb02804aeef0dd37807299e9f5a42875..6f27f3e0d0243dd19e8088b8c7cddcbf687cf984 100644 (file)
--- a/howto.txt
+++ b/howto.txt
@@ -29,6 +29,29 @@ version at some future date using:
   $ cd samba4
   $ svn up
 
+Step 1a: Use Lorikeet/Heimdal
+-----------------------------
+
+If you want to use Kerberos in Samba4, you must use
+'Lorikeet/heimdal', and place a checkout into samba4/source/heimdal
+
+There are 2 methods of doing this:
+
+  method 1:  
+    $ cd samba4/source
+    $ rsync -avz samba.org::ftp/unpacked/lorikeet-heimdal heimdal
+
+  method 2:  
+
+    $ cd samba4/source
+    $ svn co svn://svnanon.samba.org/lorikeet/trunk/heimdal heimdal
+
+both methods will create a directory called "heimdal" in the samba4/source
+directory. 
+
+(Long-term, we will either import Heimdal from 'lorikeet', or setup a
+reference between the repositories, so this and svn update works
+automaticly. In the short term, you must manually update this directory). 
 
 Step 2: compile Samba4
 ----------------------
@@ -38,9 +61,14 @@ Run this:
   $ cd samba4/source
   $ ./autogen.sh
   $ ./configure.developer -C
-  $ make
 
-If you have gcc 3.4 or newer, then run "make pch" before "make" to
+If you did not include heimdal, run this:
+  $ make proto all
+
+If you did include Heimdal, a different step is required:
+  $ make proto HEIMDAL_EXTERNAL all
+
+If you have gcc 3.4 or newer, then substitue "pch" for "proto" to
 greatly speed up the compile process (about 5x faster).
 
 
@@ -172,3 +200,5 @@ with the right options.
 
 If you get any "Operation not permitted" errors then it probably means
 you didn't try the test as root.
+
+