summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-05-27 01:34:20 +0200
committerSlávek Banko <slavek.banko@axis.cz>2014-05-27 01:34:20 +0200
commitc413f6060bb42337bed8c5e35b89a575f33652ba (patch)
tree57c2747dcecfd973067dae2926999ebef0cba632
parentb5c58c72eb8ee2f9a126db2ac6d6d3d486e85251 (diff)
downloadadmin-c413f6060bb42337bed8c5e35b89a575f33652ba.tar.gz
admin-c413f6060bb42337bed8c5e35b89a575f33652ba.zip
Fix sqlite3 plugin detection
-rw-r--r--acinclude.m4.in16
1 files changed, 14 insertions, 2 deletions
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_DEFUN([KDE_USE_QT],
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 @@ 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