[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - 2 commits - configure.ac

[Andras Timar (via logerrit)]

 configure.ac |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1c0e26ca269cb8d47cc2ea09df20d044a82e8b6e
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Oct 30 13:51:48 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Oct 30 14:50:48 2019 +0100

    fix configure check 'If we need to link with -lpcre'
    
    The test program did not compile because of
    error: unused parameter 'argc' [-Werror=unused-parameter]
    As result, we always linked with -lpcre.
    
    Change-Id: I7557025cc56fb72fc2a9f8de6142de93cfed2335
    Reviewed-on: https://gerrit.libreoffice.org/81766
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/configure.ac b/configure.ac
index 9e254b838..b40de3e60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -561,6 +561,7 @@ AS_IF([test "$ENABLE_IOSAPP" != "true"],
        #include <Poco/RegularExpression.h>
        int main(int argc, char **argv)
        {
+           (void)argc;
            Poco::RegularExpression e("abc.[def]");
            Poco::RegularExpression::Match m;
            return e.match(argv[[1]], m);
commit b550eed393e15c030baa3e1081c898a47171251c
Author:     Yunusemre Şentürk <yunusemre at collabora.com>
AuthorDate: Wed Oct 30 10:03:49 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Oct 30 14:50:41 2019 +0100

    change linking order of poco libs in order to make static linking possible
    
    Change-Id: I8de3f454f9174d78777303779acdb6c9c1ba2c7c
    Reviewed-on: https://gerrit.libreoffice.org/81765
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/configure.ac b/configure.ac
index 5e8131b06..9e254b838 100644
--- a/configure.ac
+++ b/configure.ac
@@ -513,7 +513,7 @@ else
 fi
 AC_SUBST(ENABLE_SUPPORT_KEY)
 
-LIBS="$LIBS -lPocoNet${POCO_DEBUG_SUFFIX} -lPocoUtil${POCO_DEBUG_SUFFIX} -lPocoJSON${POCO_DEBUG_SUFFIX} -lPocoFoundation${POCO_DEBUG_SUFFIX} -lPocoXML${POCO_DEBUG_SUFFIX} -lPocoNetSSL${POCO_DEBUG_SUFFIX} -lPocoCrypto${POCO_DEBUG_SUFFIX}"
+LIBS="$LIBS -lPocoNet${POCO_DEBUG_SUFFIX} -lPocoNetSSL${POCO_DEBUG_SUFFIX} -lPocoUtil${POCO_DEBUG_SUFFIX} -lPocoJSON${POCO_DEBUG_SUFFIX} -lPocoXML${POCO_DEBUG_SUFFIX} -lPocoFoundation${POCO_DEBUG_SUFFIX} -lPocoCrypto${POCO_DEBUG_SUFFIX}"
 
 AS_IF([test "$ENABLE_IOSAPP" != "true"],
       [AC_CHECK_HEADERS([LibreOfficeKit/LibreOfficeKit.h],