[ooo-build-commit] patches/dev300

[Petr Mladek]

 patches/dev300/kde4-configure.diff |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e5ce9e88f9405e3b693b158cddee51a22409ef19
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jun 15 14:07:06 2009 +0200

    Correct help for --enable-kde4 in the upstream copnfigure
    
    * patches/dev300/kde4-configure.diff: We support both KDE3 and KDE4
      parallel
    
    |# like here.

diff --git a/patches/dev300/kde4-configure.diff b/patches/dev300/kde4-configure.diff
index bb93660..25cdd30 100644
--- a/patches/dev300/kde4-configure.diff
+++ b/patches/dev300/kde4-configure.diff
@@ -2,13 +2,14 @@ diff --git configure.in configure.in
 index d2d8406..3a878bb 100644
 --- configure.in
 +++ configure.in
-@@ -269,6 +269,10 @@ AC_ARG_ENABLE(kde,
+@@ -269,6 +269,11 @@ AC_ARG_ENABLE(kde,
  AC_ARG_ENABLE(kdeab,
  [  --disable-kdeab         Disable the KDE address book support
  ],,if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi)
 +AC_ARG_ENABLE(kde4,
 +[  --enable-kde4            Determines whether to use Qt4/KDE4 vclplug on platforms
-+                          where Qt4 and KDE4 are available. Should not be used with --enable-kde.
++                          where Qt4 and KDE4 are available. May be used with --enable-kde 
++                          if you want to support both KDE3 and KDE4.
 +],,)
  AC_ARG_ENABLE(binfilter,
  [  --disable-binfilter     Disable legacy binary file formats filters