[Libreoffice-commits] core.git: configure.ac

[Libreoffice Gerrit user]

 configure.ac |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit 72385abba9d02670349e18478cef4bf53b330cda
Author:     Aleksei Nikiforov <darktemplar at basealt.ru>
AuthorDate: Wed Jan 9 17:27:03 2019 +0300
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Jan 11 14:42:25 2019 +0100

    KDE5: return multilib support
    
    Change-Id: Id416ff399e443175b7c7d608c8a7a4bc38eeedcf
    Reviewed-on: https://gerrit.libreoffice.org/66145
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/configure.ac b/configure.ac
index 13551d6f3749..0a6db77f230d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10907,6 +10907,20 @@ AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT)
 AC_SUBST(SYSTEM_RHINO)
 AC_SUBST(RHINO_JAR)
 
+# This is only used in Qt5/KDE5 checks to determine if /usr/lib64
+# paths should be added to library search path. So lets put all 64-bit
+# platforms there.
+supports_multilib=
+case "$host_cpu" in
+x86_64 | powerpc64 | powerpc64le | s390x | aarch64 | mips64 | mips64el)
+    if test "$SAL_TYPES_SIZEOFLONG" = "8"; then
+        supports_multilib="yes"
+    fi
+    ;;
+*)
+    ;;
+esac
+
 dnl ===================================================================
 dnl QT5 Integration
 dnl ===================================================================