diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 18:52:38 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 18:52:38 +0100 |
commit | f6dbdd9c16166f345fd5743886229192c97c2c4f (patch) | |
tree | 05e5e7b806dd627be4e3ba6fc9a32f115847acb0 /configure | |
parent | b8084618545570a8832d344a2e9586e1226cc697 (diff) | |
parent | 47efa9213d92a4366e03bd6d056837cd5bbadb1e (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/sql/drivers/sqlite/qsql_sqlite.cpp
Change-Id: Ia7cffd2c99ae3d5eea6b5740683c06e921336dcd
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 17 |
1 files changed, 17 insertions, 0 deletions
@@ -687,6 +687,7 @@ CFG_MIPS_DSP=auto CFG_MIPS_DSPR2=auto CFG_CLOCK_GETTIME=auto CFG_CLOCK_MONOTONIC=auto +CFG_POSIX_FALLOCATE=auto CFG_MREMAP=auto CFG_GETADDRINFO=auto CFG_IPV6IFNAME=auto @@ -5143,6 +5144,9 @@ if [ "$CFG_XCB" != "no" ]; then if [ "$CFG_XCB_XLIB" != "no" ]; then if compileTest qpa/xcb-xlib "xcb-xlib" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then QT_CONFIG="$QT_CONFIG xcb-xlib" + CFG_XCB_XLIB=yes + else + CFG_XCB_XLIB=no fi fi @@ -5457,6 +5461,15 @@ elif [ "$CFG_CLOCK_GETTIME" = "no" ]; then CFG_CLOCK_MONOTONIC=no fi +# detect posix_fallocate +if [ "$CFG_POSIX_FALLOCATE" = "auto" ]; then + if compileTest unix/posix_fallocate "posix_fallocate"; then + CFG_POSIX_FALLOCATE=yes + else + CFG_POSIX_FALLOCATE=no + fi +fi + # detect mremap if [ "$CFG_MREMAP" = "auto" ]; then if compileTest unix/mremap "mremap"; then @@ -5781,6 +5794,9 @@ fi if [ "$CFG_CLOCK_MONOTONIC" = "yes" ]; then QT_CONFIG="$QT_CONFIG clock-monotonic" fi +if [ "$CFG_POSIX_FALLOCATE" = "yes" ]; then + QT_CONFIG="$QT_CONFIG posix_fallocate" +fi if [ "$CFG_MREMAP" = "yes" ]; then QT_CONFIG="$QT_CONFIG mremap" fi @@ -6260,6 +6276,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$CFG_GLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GLIB" [ "$CFG_QGTKSTYLE" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_GTK" [ "$CFG_CLOCK_MONOTONIC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CLOCK_MONOTONIC" +[ "$CFG_POSIX_FALLOCATE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_POSIX_FALLOCATE" [ "$CFG_MREMAP" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MREMAP" [ "$CFG_GETADDRINFO" = "no" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GETADDRINFO" [ "$CFG_IPV6IFNAME" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6IFNAME" |