[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - autogen.sh

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Sun Oct 6 11:37:37 UTC 2019


 autogen.sh |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f5c6930e752d1d9d4ce84d6e302d6da256b54fa6
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Sun Oct 6 14:32:22 2019 +0300
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Sun Oct 6 14:36:44 2019 +0300

    Use the same libtool snippet as in master
    
    Sadly, we do need libtool even when building for iOS, just to get the
    configure script produced, which we need to be able to run to get the
    symlink to the core build directory set up, and to copy the app icon
    and online artwork.
    
    (I tried once to get rid of the use of libtool in Online, but it was
    more complicated than I had patience.)
    
    Change-Id: I889f598f7a1134ef528376e948cd35c9f90e8e5c

diff --git a/autogen.sh b/autogen.sh
index 1e558726f..f5043bec5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,6 +18,8 @@ EOF
 
 if test `uname -s` = Linux; then
     libtoolize || failed "libtool"
+elif test `uname -s` = Darwin; then
+    glibtoolize || failed "Can't find glibtoolize. For instance use the one from https://brew.sh, 'brew install libtool', or build GNU libtool yourself."
 fi
 
 aclocal || failed "aclocal"


More information about the Libreoffice-commits mailing list