diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 223 |
1 files changed, 99 insertions, 124 deletions
@@ -803,7 +803,6 @@ CFG_XINPUT=runtime CFG_XKB=auto CFG_XCB=auto CFG_XCB_GLX=no -CFG_XCB_LIMITED=yes CFG_EGLFS=auto CFG_DIRECTFB=auto CFG_LINUXFB=auto @@ -847,7 +846,6 @@ CFG_INOTIFY=auto CFG_RPATH=yes CFG_FRAMEWORK=auto CFG_MAC_HARFBUZZ=no -CFG_PREFIX_INSTALL=yes CFG_SDK= DEFINES= D_FLAGS= @@ -886,6 +884,8 @@ QT_INSTALL_LIBS= QT_INSTALL_BINS= QT_INSTALL_PLUGINS= QT_INSTALL_IMPORTS= +QT_INSTALL_QML= +QT_INSTALL_ARCHDATA= QT_INSTALL_DATA= QT_INSTALL_TRANSLATIONS= QT_INSTALL_SETTINGS= @@ -994,7 +994,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style options that pass an argument - -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig) + -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" @@ -1209,6 +1209,12 @@ while [ "$#" -gt 0 ]; do importdir) QT_INSTALL_IMPORTS="$VAL" ;; + qmldir) + QT_INSTALL_QML="$VAL" + ;; + archdatadir) + QT_INSTALL_ARCHDATA="$VAL" + ;; datadir) QT_INSTALL_DATA="$VAL" ;; @@ -1423,13 +1429,6 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - prefix-install) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_PREFIX_INSTALL="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; debug) CFG_DEBUG="$VAL" ;; @@ -1723,8 +1722,11 @@ while [ "$#" -gt 0 ]; do fi ;; xcb) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ] || [ "$VAL" = "qt" ]; then CFG_XCB="$VAL" + if [ "$VAL" = "yes" ]; then + CFG_XCB="system" + fi else UNKNOWN_OPT=yes fi @@ -2778,79 +2780,54 @@ if [ -z "$QT_INSTALL_PREFIX" ]; then fi QT_INSTALL_PREFIX=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_PREFIX"` -if [ -z "$QT_INSTALL_DOCS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$BUILD_ON_MAC" = "yes" ]; then - QT_INSTALL_DOCS="/Developer/Documentation/Qt" - fi - fi - [ -z "$QT_INSTALL_DOCS" ] && QT_INSTALL_DOCS="$QT_INSTALL_PREFIX/doc" #fallback - -fi -QT_INSTALL_DOCS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DOCS"` - if [ -z "$QT_INSTALL_HEADERS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$BUILD_ON_MAC" = "yes" ]; then - if [ "$CFG_FRAMEWORK" = "yes" ]; then - QT_INSTALL_HEADERS= - fi - fi - fi - [ -z "$QT_INSTALL_HEADERS" ] && QT_INSTALL_HEADERS="$QT_INSTALL_PREFIX/include" - + QT_INSTALL_HEADERS="$QT_INSTALL_PREFIX/include" fi QT_INSTALL_HEADERS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_HEADERS"` if [ -z "$QT_INSTALL_LIBS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$BUILD_ON_MAC" = "yes" ]; then - if [ "$CFG_FRAMEWORK" = "yes" ]; then - QT_INSTALL_LIBS="/Library/Frameworks" - fi - fi - fi - [ -z "$QT_INSTALL_LIBS" ] && QT_INSTALL_LIBS="$QT_INSTALL_PREFIX/lib" #fallback + QT_INSTALL_LIBS="$QT_INSTALL_PREFIX/lib" #fallback fi QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"` +if [ -z "$QT_INSTALL_ARCHDATA" ]; then #default + QT_INSTALL_ARCHDATA="$QT_INSTALL_PREFIX" #fallback +fi +QT_INSTALL_ARCHDATA=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_ARCHDATA"` + +if [ -z "$QT_INSTALL_DATA" ]; then #default + QT_INSTALL_DATA="$QT_INSTALL_PREFIX" #fallback +fi +QT_INSTALL_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DATA"` + if [ -z "$QT_INSTALL_BINS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$BUILD_ON_MAC" = "yes" ]; then - QT_INSTALL_BINS="/Developer/Applications/Qt" - fi - fi - [ -z "$QT_INSTALL_BINS" ] && QT_INSTALL_BINS="$QT_INSTALL_PREFIX/bin" #fallback + QT_INSTALL_BINS="$QT_INSTALL_PREFIX/bin" #fallback fi QT_INSTALL_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_BINS"` +if [ -z "$QT_INSTALL_DOCS" ]; then #default + QT_INSTALL_DOCS="$QT_INSTALL_DATA/doc" #fallback +fi +QT_INSTALL_DOCS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DOCS"` + if [ -z "$QT_INSTALL_PLUGINS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$BUILD_ON_MAC" = "yes" ]; then - QT_INSTALL_PLUGINS="/Developer/Applications/Qt/plugins" - fi - fi - [ -z "$QT_INSTALL_PLUGINS" ] && QT_INSTALL_PLUGINS="$QT_INSTALL_PREFIX/plugins" #fallback + QT_INSTALL_PLUGINS="$QT_INSTALL_ARCHDATA/plugins" #fallback fi QT_INSTALL_PLUGINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_PLUGINS"` if [ -z "$QT_INSTALL_IMPORTS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$BUILD_ON_MAC" = "yes" ]; then - QT_INSTALL_IMPORTS="/Developer/Applications/Qt/imports" - fi - fi - [ -z "$QT_INSTALL_IMPORTS" ] && QT_INSTALL_IMPORTS="$QT_INSTALL_PREFIX/imports" #fallback + QT_INSTALL_IMPORTS="$QT_INSTALL_ARCHDATA/imports" #fallback fi QT_INSTALL_IMPORTS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_IMPORTS"` -if [ -z "$QT_INSTALL_DATA" ]; then #default - QT_INSTALL_DATA="$QT_INSTALL_PREFIX" +#qml +if [ -z "$QT_INSTALL_QML" ]; then #default + QT_INSTALL_QML="$QT_INSTALL_ARCHDATA/qml" #fallback fi -QT_INSTALL_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DATA"` +QT_INSTALL_QML=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_QML"` if [ -z "$QT_INSTALL_TRANSLATIONS" ]; then #default - QT_INSTALL_TRANSLATIONS="$QT_INSTALL_PREFIX/translations" + QT_INSTALL_TRANSLATIONS="$QT_INSTALL_DATA/translations" #fallback fi QT_INSTALL_TRANSLATIONS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_TRANSLATIONS"` @@ -2864,23 +2841,13 @@ fi QT_INSTALL_SETTINGS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_SETTINGS"` if [ -z "$QT_INSTALL_EXAMPLES" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$BUILD_ON_MAC" = "yes" ]; then - QT_INSTALL_EXAMPLES="/Developer/Examples/Qt" - fi - fi - [ -z "$QT_INSTALL_EXAMPLES" ] && QT_INSTALL_EXAMPLES="$QT_INSTALL_PREFIX/examples" #fallback + QT_INSTALL_EXAMPLES="$QT_INSTALL_PREFIX/examples" #fallback fi QT_INSTALL_EXAMPLES=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_EXAMPLES"` #tests if [ -z "$QT_INSTALL_TESTS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$BUILD_ON_MAC" = "yes" ]; then - QT_INSTALL_TESTS="/Developer/Tests/Qt" - fi - fi - [ -z "$QT_INSTALL_TESTS" ] && QT_INSTALL_TESTS="$QT_INSTALL_PREFIX/tests" #fallback + QT_INSTALL_TESTS="$QT_INSTALL_PREFIX/tests" #fallback fi QT_INSTALL_TESTS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_TESTS"` @@ -2896,12 +2863,7 @@ fi if [ -z "$QT_HOST_BINS" ]; then #default if $haveHpx; then - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$BUILD_ON_MAC" = "yes" ]; then - QT_HOST_BINS="/Developer/Applications/Qt" - fi - fi - [ -z "$QT_HOST_BINS" ] && QT_HOST_BINS="$QT_HOST_PREFIX/bin" #fallback + QT_HOST_BINS="$QT_HOST_PREFIX/bin" #fallback else QT_HOST_BINS="$QT_INSTALL_BINS" fi @@ -2912,7 +2874,7 @@ if [ -z "$QT_HOST_DATA" ]; then #default if $haveHpx; then QT_HOST_DATA="$QT_HOST_PREFIX" else - QT_HOST_DATA="$QT_INSTALL_DATA" + QT_HOST_DATA="$QT_INSTALL_ARCHDATA" fi else QT_HOST_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_DATA"` @@ -3048,31 +3010,28 @@ Installation options: not given, the current build directory will be used. (default PREFIX) - * -prefix-install .... Force a sandboxed "local" installation of - Qt. This will install into - $QT_INSTALL_PREFIX, if this option is - disabled then some platforms will attempt a - "system" install by placing default values - in a system location other than PREFIX. - You may use these to separate different parts of the install: -bindir <dir> ......... Executables will be installed to <dir> (default PREFIX/bin) - -libdir <dir> ......... Libraries will be installed to <dir> - (default PREFIX/lib) - -docdir <dir> ......... Documentation will be installed to <dir> - (default PREFIX/doc) -headerdir <dir> ...... Headers will be installed to <dir> (default PREFIX/include) + -libdir <dir> ......... Libraries will be installed to <dir> + (default PREFIX/lib) + -archdatadir <dir>..... Arch-dependent data used by Qt will be installed to <dir> + (default PREFIX) -plugindir <dir> ...... Plugins will be installed to <dir> - (default PREFIX/plugins) - -importdir <dir> ...... Imports for QML will be installed to <dir> - (default PREFIX/imports) - -datadir <dir> ........ Data used by Qt programs will be installed to <dir> + (default ARCHDATADIR/plugins) + -importdir <dir> ...... Imports for QML1 will be installed to <dir> + (default ARCHDATADIR/imports) + -qmldir <dir> ......... Imports for QML2 will be installed to <dir> + (default ARCHDATADIR/qml) + -datadir <dir> ........ Arch-independent data used by Qt will be installed to <dir> (default PREFIX) + -docdir <dir> ......... Documentation will be installed to <dir> + (default DATADIR/doc) -translationdir <dir> . Translations of Qt programs will be installed to <dir> - (default PREFIX/translations) + (default DATADIR/translations) -sysconfdir <dir> ..... Settings used by Qt programs will be looked for in <dir> (default PREFIX/etc/settings) -examplesdir <dir> .... Examples will be installed to <dir> @@ -3202,6 +3161,10 @@ Third Party Libraries: -qt-pcre ........... Use the PCRE library bundled with Qt. + -system-pcre ....... Use the PCRE library from the operating system. + -qt-xcb ............ Use xcb- libraries bundled with Qt. + (libxcb.so will still be used from operating system). + + -system-xcb ........ Use xcb- libraries from the operating system. + Additional options: -make <part> ....... Add part to the list of parts to be built at make time. @@ -3546,6 +3509,8 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { "qt_binspath=$QT_INSTALL_BINS", "qt_plugpath=$QT_INSTALL_PLUGINS", "qt_impspath=$QT_INSTALL_IMPORTS", + "qt_qml2path=$QT_INSTALL_QML", + "qt_adatpath=$QT_INSTALL_ARCHDATA", "qt_datapath=$QT_INSTALL_DATA", "qt_trnspath=$QT_INSTALL_TRANSLATIONS", "qt_xmplpath=$QT_INSTALL_EXAMPLES", @@ -3704,7 +3669,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi QMAKE_BIN_DIR="$QT_INSTALL_BINS" [ -z "$QMAKE_BIN_DIR" ] && QMAKE_BIN_DIR="${QT_INSTALL_PREFIX}/bin" - QMAKE_DATA_DIR="$QT_INSTALL_DATA" + QMAKE_DATA_DIR="$QT_INSTALL_ARCHDATA" [ -z "$QMAKE_DATA_DIR" ] && QMAKE_DATA_DIR="${QT_INSTALL_PREFIX}" echo >>"$mkfile" adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'` @@ -4801,23 +4766,37 @@ fi if [ "$CFG_XCB" != "no" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then - QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb xcb-image xcb-keysyms xcb-icccm xcb-sync xcb-xfixes xcb-randr 2>/dev/null`" - QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb xcb-image xcb-keysyms xcb-icccm xcb-sync xcb-xfixes xcb-randr 2>/dev/null`" + QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null`" + QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb 2>/dev/null`" fi if compileTest qpa/xcb "xcb" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then - CFG_XCB=yes - if compileTest qpa/xcb-render "xcb-render" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then - QT_CONFIG="$QT_CONFIG xcb-render" - fi - if compileTest qpa/xcb-glx "xcb-glx" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then - CFG_XCB_GLX=yes - QT_CONFIG="$QT_CONFIG xcb-glx" - fi + if [ "$CFG_XCB" = "qt" ]; then + QT_CONFIG="$QT_CONFIG xcb-qt" + else + CFG_XCB="system" - if compileTest qpa/xcb-poll-for-queued-event "xcb-poll-for-queued-event" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then - CFG_XCB_LIMITED=no - QT_CONFIG="$QT_CONFIG xcb-poll-for-queued-event" + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then + XCB_PACKAGES="xcb xcb-shm xcb-sync xcb-xfixes xcb-randr xcb-image xcb-keysyms xcb-icccm" + QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null`" + QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null`" + fi + + if compileTest qpa/xcb-syslibs "xcb-syslibs" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then + if compileTest qpa/xcb-render "xcb-render" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then + QT_CONFIG="$QT_CONFIG xcb-render" + fi + + if compileTest qpa/xcb-glx "xcb-glx" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then + CFG_XCB_GLX=yes + QT_CONFIG="$QT_CONFIG xcb-glx" + fi + else + echo "The test for linking against libxcb and support libraries failed!" + echo " You might need install dependency packages, or pass -qt-xcb." + echo " See src/plugins/platforms/xcb/README." + exit 1 + fi fi if compileTest qpa/xcb-xlib "xcb-xlib" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then @@ -4842,9 +4821,9 @@ if [ "$CFG_XCB" != "no" ]; then fi fi else - if [ "$CFG_XCB" = "yes" ]; then - echo "The XCB test failed!" - echo " You might need to install dependency packages." + if [ "$CFG_XCB" != "auto" ]; then + echo "The test for linking against libxcb failed!" + echo " You might need to install dependency packages for libxcb." echo " See src/plugins/platforms/xcb/README." exit 1 fi @@ -4962,14 +4941,14 @@ if [ "$CFG_ACCESSIBILITY" != "no" ]; then if [ "$CFG_XCB" = "no" ]; then CFG_ACCESSIBILITY=yes else - # linux/xcb accessibility needs dbus and atspi-2 - if [ "$CFG_DBUS" != "no" ] && [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "atspi-2" 2>/dev/null; then + # linux/xcb accessibility needs dbus + if [ "$CFG_DBUS" != "no" ] && [ -n "$PKG_CONFIG" ]; then CFG_ACCESSIBILITY=yes else if [ "$CFG_ACCESSIBILITY" = "auto" ]; then CFG_ACCESSIBILITY=no else - echo "Accessibility support needs pkg-config and libatspi2." + echo "Accessibility support needs DBus." exit 101 fi fi @@ -5471,7 +5450,7 @@ fi [ "$CFG_OPENSSL" = "yes" ] && QT_CONFIG="$QT_CONFIG openssl" [ "$CFG_OPENSSL" = "linked" ] && QT_CONFIG="$QT_CONFIG openssl-linked" [ "$CFG_MAC_HARFBUZZ" = "yes" ] && QT_CONFIG="$QT_CONFIG harfbuzz" -[ "$CFG_XCB" = "yes" ] && QT_CONFIG="$QT_CONFIG xcb" +[ "$CFG_XCB" != "no" ] && QT_CONFIG="$QT_CONFIG xcb" [ "$CFG_XINPUT2" = "yes" ] && QT_CONFIG="$QT_CONFIG xinput2" [ "$CFG_SYSTEM_PROXIES" = "yes" ] && QT_CONFIG="$QT_CONFIG system-proxies" @@ -6074,7 +6053,7 @@ fi #------------------------------------------------------------------------------- QTMODULE="$outpath/mkspecs/qmodule.pri" -echo "CONFIG += $QMAKE_CONFIG create_prl link_prl prepare_docs fix_output_dirs no_private_qt_headers_warning QTDIR_build" >> "$QTMODULE.tmp" +echo "CONFIG += $QMAKE_CONFIG" >> "$QTMODULE.tmp" echo "QT_BUILD_PARTS += $CFG_BUILD_PARTS" >> "$QTMODULE.tmp" if [ -n "$QT_CFLAGS_PSQL" ]; then @@ -6308,13 +6287,9 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then fi echo "libICU support ......... $CFG_ICU" echo "PCRE support ........... $CFG_PCRE" -if [ "$CFG_XCB_LIMITED" = "yes" ] && [ "$CFG_XCB" = "yes" ]; then - echo "Xcb support ............ limited (old version)" -else - echo "Xcb support ............ $CFG_XCB" -fi +echo "Xcb support ............ $CFG_XCB" echo "Xrender support ........ $CFG_XRENDER" -if [ "$XPLATFORM_MAEMO" = "yes" ] && [ "$CFG_XCB" = "yes" ]; then +if [ "$XPLATFORM_MAEMO" = "yes" ] && [ "$CFG_XCB" != "no" ]; then echo "XInput2 support ........ $CFG_XINPUT2" fi echo "EGLFS support .......... $CFG_EGLFS" |