Fix sqlite3 plugin detection

diff --git a/acinclude.m4.in b/acinclude.m4.in
index de797c1..cf74515 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -1263,7 +1263,7 @@
     AC_MSG_RESULT(Detected TQt3...)
   fi
   if test "$kde_qtver" = "4"; then
-    AC_MSG_RESULT(Detected TQt4...)
+    AC_MSG_RESULT(Detected Qt4...)
   fi
 
 #else
@@ -6812,7 +6812,19 @@
       QTDIR=`dirname $MOC`
       QTDIR=${QTDIR%/bin}
     fi
-    LIBSQLITE3=${QTDIR}/plugins/sqldrivers/libsqlite3${qtlib}.so
+    if test "$PKG_CONFIG" != "no" ; then
+      if $PKG_CONFIG --exists qt-mt ; then
+        qt_plugins_dir="`pkg-config --variable=pluginsdir qt-mt`"
+      else
+        if $PKG_CONFIG --exists tqt-mt ; then
+          qt_plugins_dir="`pkg-config --variable=pluginsdir tqt-mt`"
+        fi
+      fi
+    fi
+    if test "x$qt_plugins_dir" = "x"; then
+      qt_plugins_dir=${QTDIR}/plugins
+    fi
+    LIBSQLITE3=${qt_plugins_dir}/sqldrivers/libqsqlite3${qtlib}.so
 
     # do the checks
     if test $enable_sqlite3 = auto; then

Update default pam service name to 'tde'

diff --git a/acinclude.m4.in b/acinclude.m4.in
index cf74515..d167c2c 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -4471,7 +4471,7 @@
     AC_HELP_STRING([--with-pam[=ARG]],[enable support for PAM: ARG=[yes|no|service name]]),
     [ if test "x$withval" = "xyes"; then
         want_pam=yes
-        pam_service=kde
+        pam_service=tde
       elif test "x$withval" = "xno"; then
         want_pam=no
       else