Branch: master

fc69c94a 2014-05-26 19:57:13 Slávek Banko
Remove qt3 sqlite3 plugin source tarball
Fix sqlite3 plugin detection
M acinclude.m4
R 23011-qt-sqlite3-0.2.tar.gz
diff --git a/23011-qt-sqlite3-0.2.tar.gz b/23011-qt-sqlite3-0.2.tar.gz
deleted file mode 100644
index efa6451..0000000
--- a/23011-qt-sqlite3-0.2.tar.gz
+++ /dev/null
Binary files differ
diff --git a/acinclude.m4 b/acinclude.m4
index d5e5f96..29c1314 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -12122,7 +12122,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