diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-05-27 02:57:13 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-05-27 02:57:13 +0200 |
| commit | fc69c94a95a3a8d2fe37a8e876404ab29ea61854 (patch) | |
| tree | 58abf0a83febdf0b7fe8129f8d7e04c6f622584b | |
| parent | 3a03a2801bbae552e52852be299bc611fac4bb2e (diff) | |
| download | kmymoney-fc69c94a.tar.gz kmymoney-fc69c94a.zip | |
Remove qt3 sqlite3 plugin source tarball
Fix sqlite3 plugin detection
| -rw-r--r-- | 23011-qt-sqlite3-0.2.tar.gz | bin | 9148 -> 0 bytes | |||
| -rw-r--r-- | acinclude.m4 | 14 |
2 files changed, 13 insertions, 1 deletions
diff --git a/23011-qt-sqlite3-0.2.tar.gz b/23011-qt-sqlite3-0.2.tar.gz Binary files differdeleted file mode 100644 index efa6451..0000000 --- a/23011-qt-sqlite3-0.2.tar.gz +++ /dev/null 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 |