summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-03-18 20:58:02 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-25 23:11:22 +0100
commita3c802e7e504be00fa5d25893bd967e6b628afc6 (patch)
treeb6c9a1acee4c6a9e5ffd79d35f89d12720060bb8
parentffe45f1896adfff93258b917f6a566dcc06a6597 (diff)
Make sure that we check that pkg-config knows sqlite3 before using it
Otherwise, we end up with an empty QT_LFLAGS_SQLITE and the plugin won't link. Change-Id: I026f60bf9cd075218dbe2888fbb7fc82782b27ca Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index a276647137..92f326e93b 100755
--- a/configure
+++ b/configure
@@ -4631,7 +4631,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
if [ "$CFG_SQL_sqlite" != "no" ]; then
SQLITE_AUTODETECT_FAILED="no"
if [ "$CFG_SQLITE" = "system" ]; then
- if [ -n "$PKG_CONFIG" ]; then
+ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists sqlite3 2>/dev/null; then
QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null`
QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null`
else