AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Define QT_NO_FOO also when -no-foo is passed to configure.

Browse Source 
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>
This commit is contained in:
Davide Pesavento 2012-08-08 00:36:23 -07:00 committed by Qt by Nokia
parent dec934cd96
commit 40cfcd0b0c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -4635,9 +4635,11 @@ if [ "$CFG_LIBUDEV" != "no" ]; then
exit 1 exit 1
else else
CFG_LIBUDEV=no CFG_LIBUDEV=no
QMakeVar add DEFINES QT_NO_LIBUDEV
fi fi
fi fi
if [ "$CFG_LIBUDEV" = "no" ]; then
QMakeVar add DEFINES QT_NO_LIBUDEV
fi
if [ "$CFG_EVDEV" != "no" ]; then 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 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 exit 1
else else
CFG_EVDEV=no CFG_EVDEV=no
QMakeVar add DEFINES QT_NO_EVDEV
fi fi
fi fi
if [ "$CFG_EVDEV" = "no" ]; then
QMakeVar add DEFINES QT_NO_EVDEV
fi
# Check we actually have X11 :-) # 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 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 exit 1
fi fi
CFG_XCB=no CFG_XCB=no
QMakeVar add DEFINES QT_NO_XCB
fi fi
fi fi
if [ "$CFG_XCB" = "no" ]; then
QMakeVar add DEFINES QT_NO_XCB
fi
if [ "$CFG_DIRECTFB" != "no" ]; then if [ "$CFG_DIRECTFB" != "no" ]; then
if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists directfb 2>/dev/null; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists directfb 2>/dev/null; then