[PATCH] Add tests for KDE to generate an error message rather than crash
Wol
anthony at youngman.org.uk
Fri Nov 12 12:20:03 PST 2010
---
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
--------------080502020701030601010109--
More information about the LibreOffice
mailing list