Fixed following issues:

- bug in original admin module with wrong "fi" position (by Slávek
Banko)
- default settings for path check
- test for tqt3 detection

Signed-off-by: Michele Calgaro <[email protected]>
Signed-off-by: Slávek Banko <[email protected]>

1 files 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"
   ]
   )