diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 38 |
1 files changed, 30 insertions, 8 deletions
@@ -1803,6 +1803,20 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + pulseaudio) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_PULSEAUDIO="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; + alsa) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_ALSA="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; gtkstyle) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_QGTKSTYLE="$VAL" @@ -2367,6 +2381,12 @@ Third Party Libraries: -no-glib ........... Do not compile Glib support. + -glib .............. Compile Glib support. + -no-pulseaudio ..... Do not compile PulseAudio support. + + -pulseaudio ........ Compile PulseAudio support. + + -no-alsa ........... Do not compile ALSA support. + + -alsa .............. Compile ALSA support. + Additional options: -make <part> ....... Add part to the list of parts to be built at make time. @@ -3176,7 +3196,7 @@ if [ "$CFG_PRECOMPILE" = "auto" ]; then fi fi -# auto-detect support for separate debug info in objcopy +# sanity-check for separate debug info if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then if [ "$CFG_SHARED" = "no" ]; then echo "ERROR: -separate-debug-info is incompatible with -static" @@ -3186,13 +3206,6 @@ if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then echo "ERROR: -separate-debug-info needs -debug, -debug-and-release, or -force-debug-info" exit 1 fi - TEST_OBJCOPY=`getXQMakeConf QMAKE_OBJCOPY` - COMPILER_WITH_FLAGS="$TEST_COMPILER $TEST_COMPILER_CXXFLAGS" - if "$unixtests/objcopy.test" "$COMPILER_WITH_FLAGS" "$TEST_OBJCOPY" "$OPT_VERBOSE"; then - echo "ERROR: -separate-debug-info was requested but this binutils does not support it." - echo "Re-run configure with -v for more information" - exit 1 - fi fi # auto-detect -fvisibility support @@ -3934,6 +3947,15 @@ fi # functionality tests #------------------------------------------------------------------------------- +# Detect objcopy support +if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then + if ! compileTest unix/objcopy "objcopy"; then + echo "ERROR: -separate-debug-info was requested but this binutils does not support it." + echo "Re-run configure with -v for more information" + exit 1 + fi +fi + # Detect C++11 support if [ "$CFG_CXX11" != "no" ]; then # Configure detects compiler features based on cross compiler, so we need |