diff options
| author | Davide Pesavento <davidepesa@gmail.com> | 2012-08-08 00:36:23 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-08 12:04:49 +0200 |
| commit | 40cfcd0b0c532fa3e261ff17ecc8265bf9f5e1d3 (patch) | |
| tree | de8ec9ae9c2e169def53e312f2f0a6e4191095c3 /configure | |
| parent | dec934cd967335898f8dbd9beb24c28833b6294e (diff) | |
| download | qtbase-40cfcd0b0c532fa3e261ff17ecc8265bf9f5e1d3.tar.gz | |
Define QT_NO_FOO also when -no-foo is passed to configure.
This fixes a build failure that happens when Qt is configured with
-no-libudev, as reported at https://bugs.gentoo.org/show_bug.cgi?id=430292
Change-Id: I924f023505ab57cca5994f2fd5ff2f8308e61617
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -4635,9 +4635,11 @@ if [ "$CFG_LIBUDEV" != "no" ]; then exit 1 else CFG_LIBUDEV=no - QMakeVar add DEFINES QT_NO_LIBUDEV fi fi +if [ "$CFG_LIBUDEV" = "no" ]; then + QMakeVar add DEFINES QT_NO_LIBUDEV +fi if [ "$CFG_EVDEV" != "no" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/evdev "evdev" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then @@ -4648,9 +4650,11 @@ if [ "$CFG_EVDEV" != "no" ]; then exit 1 else CFG_EVDEV=no - QMakeVar add DEFINES QT_NO_EVDEV fi fi +if [ "$CFG_EVDEV" = "no" ]; then + QMakeVar add DEFINES QT_NO_EVDEV +fi # Check we actually have X11 :-) if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then @@ -4720,9 +4724,11 @@ if [ "$CFG_XCB" != "no" ]; then exit 1 fi CFG_XCB=no - QMakeVar add DEFINES QT_NO_XCB fi fi +if [ "$CFG_XCB" = "no" ]; then + QMakeVar add DEFINES QT_NO_XCB +fi if [ "$CFG_DIRECTFB" != "no" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists directfb 2>/dev/null; then |