From fc69c94a95a3a8d2fe37a8e876404ab29ea61854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 27 May 2014 02:57:13 +0200 Subject: Remove qt3 sqlite3 plugin source tarball Fix sqlite3 plugin detection --- acinclude.m4 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'acinclude.m4') diff --git a/acinclude.m4 b/acinclude.m4 index d5e5f96..29c1314 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -12122,7 +12122,19 @@ AC_DEFUN([AC_SQLITE3], [ 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 -- cgit v1.2.1