[Libreoffice-commits] online.git: 2 commits - loolwsd/README

[Tor Lillqvist]

 loolwsd/README |   22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

New commits:
commit ccf73d159d41f38f71263b210086e28d57a5d29f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Apr 11 17:04:16 2016 +0300

    Mention libtoolize, and that building from tarball is simpler
    
    (Is it?)

diff --git a/loolwsd/README b/loolwsd/README
index d5aa4be..7034b9d 100644
--- a/loolwsd/README
+++ b/loolwsd/README
@@ -25,17 +25,25 @@ On Debian 8 (Linux x86_64) you can use in /etc/apt/sources.list:
 Building
 --------
 
-loolwsd uses autoconf/automake, so build using the usual:
-
-    MASTER=/path/to/built/core.git # configure for your system
+loolwsd uses autoconf/automake, so especially when building from .git
+(as opposed to from a distribution tarball) you need the usual fun:
 
     autoreconf
+    libtoolize
     automake --add-missing
+
+possibly iterating several times...
+
+and then
+
     ./configure --enable-silent-rules --with-lokit-path=${MASTER}/include
     make
 
+
 where ${MASTER} is the location of the LibreOffice source tree.
 
+When building from a tarball less magic is needed.
+
 Run 'make check' after each commit. Requires loolwsd to be running.
 
 Note that the loolforkit program needs the CAP_SYS_CHROOT capability,
commit 9929842a692a8c43ce13b201e215e6f4b18c2aa8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Apr 11 17:00:11 2016 +0300

    It is loolforkit that has capabilities now, not loolwsd

diff --git a/loolwsd/README b/loolwsd/README
index a7f409f..d5aa4be 100644
--- a/loolwsd/README
+++ b/loolwsd/README
@@ -38,7 +38,7 @@ where ${MASTER} is the location of the LibreOffice source tree.
 
 Run 'make check' after each commit. Requires loolwsd to be running.
 
-Note that the loolwsd program needs the CAP_SYS_CHROOT capability,
+Note that the loolforkit program needs the CAP_SYS_CHROOT capability,
 thus you will be asked the root password when running make as it
 invokes sudo to run /sbin/setcap.
 
@@ -157,9 +157,9 @@ When the crash happens too early, you also want to
 so that you have time to attach to the process.
 
 Then run loolwsd, and attach your debugger to the process you are
-interested in. Note that as the loolwsd executable file has
-capabilities set, you need to run the debugger with super-user
-privilege.
+interested in. Note that as the loolforkit executable file has
+capabilities set, so when debugging that you need to run the debugger
+with super-user privilege.
 
 Also, note that as the child processes run in a chroot environment,
 they see the LibreOffice shared libraries as being in a directory tree