From 7adbc9b2341e5443427d7e33ddf7f9e2ed5de5a0 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 26 Mar 2012 14:57:40 -0300 Subject: Remove the -no-stl option from configure This was decided on the mailing list. See: http://lists.qt-project.org/pipermail/development/2012-March/002442.html http://lists.qt-project.org/pipermail/development/2012-March/002465.html Change-Id: I7681e5cc743b20f6d4e29d2aea45c50df41a0b98 Reviewed-by: Stephen Kelly Reviewed-by: Oswald Buddenhagen Reviewed-by: Robin Burchell Reviewed-by: Lars Knoll --- configure | 54 +++++++----------------------------------------------- 1 file changed, 7 insertions(+), 47 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 882f10b4cd..0009a22e04 100755 --- a/configure +++ b/configure @@ -739,7 +739,6 @@ CFG_GSTREAMER=auto CFG_QGTKSTYLE=auto CFG_LARGEFILE=auto CFG_OPENSSL=auto -CFG_STL=auto CFG_PRECOMPILE=auto CFG_SEPARATE_DEBUG_INFO=no CFG_SEPARATE_DEBUG_INFO_NOCOPY=no @@ -911,7 +910,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style yes options - -profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-eglfs|-nis|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-debug-and-release|-exceptions|-harfbuzz|-prefix-install|-silent|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-phonon-backend|-audio-backend|-declarative-debug|-javascript-jit|-rpath|-force-pkg-config|-icu|-force-asserts|-testcocoon) + -profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-eglfs|-nis|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-debug-and-release|-exceptions|-harfbuzz|-prefix-install|-silent|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-phonon-backend|-audio-backend|-declarative-debug|-javascript-jit|-rpath|-force-pkg-config|-icu|-force-asserts|-testcocoon) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAL=yes ;; @@ -1464,13 +1463,6 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - stl) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_STL="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; pch) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PRECOMPILE="$VAL" @@ -2885,13 +2877,6 @@ if [ "$OPT_HELP" = "yes" ]; then LFSY="*" LFSN=" " fi - if [ "$CFG_STL" = "auto" ] || [ "$CFG_STL" = "yes" ]; then - SHY="*" - SHN=" " - else - SHY=" " - SHN="*" - fi if [ "$CFG_PRECOMPILE" = "auto" ] || [ "$CFG_PRECOMPILE" = "no" ]; then PHY=" " PHN="*" @@ -2931,7 +2916,7 @@ Usage: $relconf [-h] [-prefix ] [-prefix-install] [-bindir ] [-libdir [-release] [-debug] [-debug-and-release] [-developer-build] [-shared] [-static] [-no-fast] [-fast] [-no-largefile] [-largefile] [-no-exceptions] [-exceptions] [-no-accessibility] - [-accessibility] [-no-stl] [-stl] [-no-sql-] [-sql-] + [-accessibility] [-no-sql-] [-sql-] [-plugin-sql-] [-system-sqlite] [-platform] [-D ] [-I ] [-L ] [-help] [-qt-zlib] [-system-zlib] [-no-gif] [-no-libpng] [-qt-libpng] [-system-libpng] @@ -3070,9 +3055,6 @@ fi -no-accessibility .. Do not compile Accessibility support. * -accessibility ..... Compile Accessibility support. - $SHN -no-stl ............ Do not compile STL support. - $SHY -stl ............... Compile STL support. - -no-sql- ... Disable SQL entirely. -qt-sql- ... Enable a SQL in the QtSql library, by default none are turned on. @@ -5220,26 +5202,13 @@ if [ "$CFG_LIBFREETYPE" = "auto" ]; then fi fi -HAVE_STL=no -if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then - HAVE_STL=yes +if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS && + [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then + echo "STL functionality check failed! Cannot build Qt with this STL library." + echo " Turn on verbose messaging (-v) to $0 to see the final report." + exit 101 fi -if [ "$CFG_STL" != "no" ]; then - if [ "$HAVE_STL" = "yes" ]; then - CFG_STL=yes - else - if [ "$CFG_STL" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "STL support cannot be enabled due to functionality tests!" - echo " Turn on verbose messaging (-v) to $0 to see the final report." - echo " If you believe this message is in error you may use the continue" - echo " switch (-continue) to $0 to continue." - exit 101 - else - CFG_STL=no - fi - fi -fi # detect POSIX clock_gettime() if [ "$CFG_CLOCK_GETTIME" = "auto" ]; then @@ -5581,11 +5550,6 @@ QMakeVar set UI_DIR ".uic/$QMAKE_OUTDIR" if [ "$CFG_LARGEFILE" = "yes" ] && [ "$XPLATFORM_MINGW" != "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG largefile" fi -if [ "$CFG_STL" = "no" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STL" -else - QMAKE_CONFIG="$QMAKE_CONFIG stl" -fi if [ "$CFG_USE_GNUMAKE" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG GNUmake" fi @@ -6301,9 +6265,6 @@ elif [ "$CFG_DEBUG" = "no" ]; then fi QT_CONFIG="$QT_CONFIG release" fi -if [ "$CFG_STL" = "yes" ]; then - QTCONFIG_CONFIG="$QTCONFIG_CONFIG stl" -fi if [ "$CFG_FRAMEWORK" = "no" ]; then QTCONFIG_CONFIG="$QTCONFIG_CONFIG qt_no_framework" else @@ -6555,7 +6516,6 @@ else echo "JavaScriptCore JIT ..... $CFG_JAVASCRIPTCORE_JIT" fi echo "Declarative debugging ...$CFG_DECLARATIVE_DEBUG" -echo "STL support ............ $CFG_STL" echo "PCH support ............ $CFG_PRECOMPILE" if [ "$CFG_ARCH" = "i386" -o "$CFG_ARCH" = "x86_64" ]; then echo "SSE2/SSE3/SSSE3......... ${CFG_SSE2}/${CFG_SSE3}/${CFG_SSSE3}" -- cgit v1.2.3