diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-05-27 01:34:20 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-12-17 02:39:39 +0100 |
| commit | 27050271c1d0245d3442299a435c641b6704017c (patch) | |
| tree | 59bf3db14fb8e0528b2352cfbe818f3f530b7012 | |
| parent | 6b5366b0e67bf22f79d5a3d368645091c82b4dbd (diff) | |
| download | admin-27050271c1d0245d3442299a435c641b6704017c.tar.gz admin-27050271c1d0245d3442299a435c641b6704017c.zip | |
Fix sqlite3 plugin detection
(cherry picked from commit c413f6060bb42337bed8c5e35b89a575f33652ba)
| -rw-r--r-- | acinclude.m4.in | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in index 7038b68..9f8bb28 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -1252,7 +1252,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 @@ -6721,7 +6721,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 |