It's not a complete patch, but it documents the requirements for KDE3,
and it adds a test for KDE4. The kde4 test doesn't (can't) easily test
for everything because libsolid doesn't seem to set up pkgconfig :-( but
at least we're trapping some of it.
If somebody who has KDE3 can finish off the kde3 bit, that would be nice ...
Cheers,
Wol
From bb4e990712130ee115ed4925dd6928a46c635b22 Mon Sep 17 00:00:00 2001
From: Wol <anthony@youngman.org.uk>
Date: Fri, 12 Nov 2010 20:20:03 +0000
Subject: [PATCH] Add tests for KDE to generate an error message rather than crash
---
configure.in | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/configure.in b/configure.in
index fb50d2f..ed0d5db 100755
--- a/configure.in
+++ b/configure.in
@@ -976,6 +976,9 @@ if test "$enable_kde" != "no"; then
if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" !=
"zCrossWin32"; then
OOO_WIDGET_FLAGS="--enable-kde"
widget_sets="kde"
+
+ # test here for libqt-mt and libDCOP
+
fi
else
OOO_WIDGET_FLAGS="--disable-kde"
@@ -985,6 +988,13 @@ if test "$enable_kde4" != "no"; then
if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" !=
"zCrossWin32"; then
OOO_WIDGET_FLAGS="$OOO_WIDGET_FLAGS --enable-kde4"
widget_sets="$widget_sets kde4"
+
+ PKG_CHECK_MODULES( FOO_KDE4, [ libQtCore ], have_kde4=true, have_kde4=false )
+ # need also to check for libsolid
+ if ! $have_kde4; then
+ AC_MSG_ERROR([KDE4 library requirements were not met])
+ fi
+
fi
else
OOO_WIDGET_FLAGS="$OOO_WIDGET_FLAGS --disable-kde4"
--
1.7.2.2
Context
- [Libreoffice] [PATCH] Test for KDE in configure.in · Wols Lists
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.