From a7f223eb92dec6dc7e2ceb06e30556b85ac2439a Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Sat, 14 Apr 2012 16:03:17 -0500
Subject: Update acinclude.m4.in to avoid "unary operator expected" output
 messages caused by failure to parse new TDE version scheme string. This
 resolves bug report 819.

---
 acinclude.m4.in | 39 ++++++++++++---------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/acinclude.m4.in b/acinclude.m4.in
index e34cd64..e4a734d 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -623,36 +623,21 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
 
-        trinity2ornewer=1
-        trinity3ornewer=1
-        if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
-            trinity2ornewer=
-            trinity3ornewer=
-        else
-            if test "$kde_qtver" = "3"; then
-              if test "$kde_qtsubver" -le 1; then
-                trinity2ornewer=
-              fi
-              if test "$kde_qtsubver" -le 2; then
-                trinity3ornewer=
-              fi
-              if test "$KDECONFIG" != "compiled"; then
-                if test `$KDECONFIG --version | grep TDE | sed 's/TDE: \(...\).*/\1/'` = 3.2; then
-                  trinity3ornewer=
-                fi
-              fi
-            fi
-            if test "$kde_qtver" = "4"; then
-              trinity2ornewer=1
-              trinity3ornewer=1
+        trinity14ornewer=1
+        if test "$kde_qtver" = "3"; then
+          if test "$KDECONFIG" != "compiled"; then
+            if test `$KDECONFIG --version | grep TDE | sed 's/TDE: R\(..\).*/\1/'` -lt 14; then
+              trinity14ornewer=
             fi
+          fi
+        fi
+        if test "$kde_qtver" = "4"; then
+          trinity14ornewer=1
         fi
 
-        if test -n "$trinity2ornewer"; then
+        if test -n "$trinity14ornewer"; then
             KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
-        fi
-        if test -n "$trinity3ornewer"; then
             KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
             AC_SUBST(MAKEKDEWIDGETS)
         fi
@@ -670,7 +655,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         DCOP_DEPENDENCIES='$(DCOPIDL)'
-        if test -n "$trinity2ornewer"; then
+        if test -n "$trinity14ornewer"; then
             KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
             DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
             AC_SUBST(KCONFIG_COMPILER)
@@ -2925,7 +2910,7 @@ dnl  all_libraries="$all_libraries $LIBTQT_LDFLAGS"
   if test "$build_arts" '!=' "no"; then
     KDE_FIND_PATH(mcopidl, TQTMCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
   fi
-  if test -n "$trinity2ornewer"; then
+  if test -n "$trinity14ornewer"; then
     KDE_FIND_PATH(dcopidlng, TQTDCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
   fi
 
-- 
cgit v1.2.1