[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - configure.ac

Michael Stahl (via logerrit) logerrit at kemper.freedesktop.org
Fri Dec 4 18:57:12 UTC 2020


 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a72a72e7ad2a7eef871d2d146ef1b0e00eeb319e
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Fri Dec 4 19:29:18 2020 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Fri Dec 4 19:29:18 2020 +0100

    configure: fix kde4_libdirs
    
    Change-Id: Ie70a4d36a63068b5e2dff4552b0b2e4754d71559

diff --git a/configure.ac b/configure.ac
index 1906280e583b..986ed019809e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10794,8 +10794,8 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE"; then
     kde4_libdirs="/usr/lib /usr/lib/kde4 /usr/lib/kde4/devel $x_libraries"
 
     if test -n "$supports_multilib"; then
-        qt4_libdirs="$qt4_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
-        kde4_libdirs="$kde4_libdirs /usr/lib64 /usr/lib64/kde4 /usr/lib64/kde4/devel"
+        qt4_libdirs="/usr/lib64/qt4 /usr/lib64/qt /usr/lib64 $qt4_libdirs"
+        kde4_libdirs="/usr/lib64 /usr/lib64/kde4 /usr/lib64/kde4/devel $kde4_libdirs"
     fi
 
     if test -n "$QTDIR"; then


More information about the Libreoffice-commits mailing list