diff options
| author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2012-07-18 09:16:47 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-18 10:35:46 (GMT) |
| commit | 41cf7a76bb3924f4ee4553c93a213dda754fdc15 (patch) | |
| tree | 28062041b1971f568b0296570a1b1885aee99bd7 /configure | |
| parent | 5210d47aa66214e3cb16f394d0510a91f770c1b1 (diff) | |
| download | Qt-41cf7a76bb3924f4ee4553c93a213dda754fdc15.zip Qt-41cf7a76bb3924f4ee4553c93a213dda754fdc15.tar.gz Qt-41cf7a76bb3924f4ee4553c93a213dda754fdc15.tar.bz2 | |
Set correct QT_LFLAGS_SQLITE for default cases.
In systems where no pkgconfig is available, such as QNX, we set
QT_LFLAGS_SQLITE to the default values.
cherry-picked from qt5/qtbase: a94e917eeb7b19eb19c3cf74d71a9b4cabfb1124
Change-Id: Iccf4e403a90e85b41c70895e1c91fe2d8f0eb573
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -5555,6 +5555,9 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do if [ -n "$PKG_CONFIG" ]; then QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null` QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null` + else + QT_CFLAGS_SQLITE= + QT_LFLAGS_SQLITE="-lsqlite3 -lz" fi if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then if [ "$CFG_SQL_sqlite" = "auto" ]; then |