From 7b38d20e88db0909cd54605f6ccef8e34de0beb9 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sun, 16 Sep 2018 18:51:11 +0900
Subject: =?UTF-8?q?Fixed=20following=20issues:=20-=20bug=20in=20original?=
 =?UTF-8?q?=20admin=20module=20with=20wrong=20"fi"=20position=20(by=20Sl?=
 =?UTF-8?q?=C3=A1vek=20Banko)=20-=20default=20settings=20for=20path=20chec?=
 =?UTF-8?q?k=20-=20test=20for=20tqt3=20detection?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 acinclude.m4.in | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/acinclude.m4.in b/acinclude.m4.in
index 8f5e9d5..1e9bcf6 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -1081,11 +1081,9 @@ EOF
 
 AC_DEFUN([KDE_USE_TQT],
 [
-#if test -z "$1"; then
-  # Current default TQt version: 3.3
-  kde_tqtver=3
-  kde_tqtsubver=3
-
+  kde_tqtver=0
+  kde_tqtsubver=0
+  
   AC_LANG_SAVE
   AC_LANG_CPLUSPLUS
   ac_cxxflags_safe="$CXXFLAGS"
@@ -1094,7 +1092,7 @@ AC_DEFUN([KDE_USE_TQT],
   #define TQT_VERSION_ONLY
   #include <tqt.h>
   #undef TQT_VERSION_ONLY
-  #ifdef USE_TQT4
+  #ifdef USE_QT4
   choke me
   #endif
   ], ,
@@ -1104,21 +1102,13 @@ AC_DEFUN([KDE_USE_TQT],
   AC_LANG_RESTORE
 
   if test "$kde_tqtver" = "3"; then
-    AC_MSG_RESULT(Detected TQt3...)
+    AC_MSG_RESULT(Detected TQt3.)
+	  # Current default TQt version: 3.3
+    kde_tqtsubver=3
+  else
+    AC_MSG_ERROR(TQt3 could not be detected!)
   fi
 
-#else
-#  kde_tqtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
-#  # following is the check if subversion isnt found in passed argument
-#  if test "$kde_tqtsubver" = "$1"; then
-#    kde_tqtsubver=1
-#  fi
-#  kde_tqtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
-#  if test "$kde_tqtver" = "1"; then
-#    kde_tqtsubver=42
-#  fi
-#fi
-
 if test -z "$2"; then
   if test "$kde_tqtver" = "3"; then
     if test $kde_tqtsubver -gt 0; then
@@ -1949,6 +1939,11 @@ if $PKG_CONFIG --exists tqt-mt ; then
 fi
 fi
 
+ LDFLAGS=$kde_ldflags_safe
+ LIBS=$kde_libs_safe
+ CXXFLAGS=$kde_cxxflags_safe
+])
+
 AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
 if test "$kde_cv_have_kdetqtaddon" = "no"; then
@@ -2003,6 +1998,7 @@ AC_DEFUN([AC_PATH_KDE],
   fi
   ],
   [
+  ac_use_path_checking="default"
   ]
   )
 
-- 
cgit v1.2.1