Browse Source

Fix sqlite3 plugin detection

tags/r14.0.0
Slávek Banko 5 years ago
parent
commit
c413f6060b
1 changed files with 14 additions and 2 deletions
  1. +14
    -2
      acinclude.m4.in

+ 14
- 2
acinclude.m4.in View File

@@ -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

Loading…
Cancel
Save