ooo-build r15426 - in branches/ooo-build-3-0-1: . patches/dev300
- From: brosenk svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r15426 - in branches/ooo-build-3-0-1: . patches/dev300
- Date: Fri, 27 Feb 2009 14:52:58 +0000 (UTC)
Author: brosenk
Date: Fri Feb 27 14:52:58 2009
New Revision: 15426
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15426&view=rev
Log:
Accept KDE 4.x with x > 1
Modified:
branches/ooo-build-3-0-1/ChangeLog
branches/ooo-build-3-0-1/patches/dev300/kde4-configure.diff
Modified: branches/ooo-build-3-0-1/patches/dev300/kde4-configure.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/kde4-configure.diff (original)
+++ branches/ooo-build-3-0-1/patches/dev300/kde4-configure.diff Fri Feb 27 14:52:58 2009
@@ -57,13 +57,13 @@
save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $KDE_CFLAGS"
- AC_MSG_CHECKING([whether KDE is between 3.2 and 3.6])
-+ AC_MSG_CHECKING([whether KDE is between 3.2 and 4.1])
++ AC_MSG_CHECKING([whether KDE is between 3.2 and 4.79])
AC_TRY_RUN([
#include <kdeversion.h>
int main(int argc, char **argv) {
if (KDE_VERSION_MAJOR == 3 && 2 <= KDE_VERSION_MINOR && KDE_VERSION_MINOR <= 6) return 0;
-+ else if (KDE_VERSION_MAJOR == 4 && 0 <= KDE_VERSION_MINOR && KDE_VERSION_MINOR <= 1) return 0;
++ else if (KDE_VERSION_MAJOR == 4 && 0 <= KDE_VERSION_MINOR && KDE_VERSION_MINOR <= 79) return 0;
else return 1;
}
], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([KDE version too old or too recent, please use another version of KDE or disable KDE address book support])])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]