diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 94 |
1 files changed, 1 insertions, 93 deletions
@@ -407,18 +407,6 @@ while [ "$#" -gt 0 ]; do aix-64) PLATFORM=aix-xlc-64 ;; - irix-o32) - PLATFORM=irix-cc-o32 - ;; - irix-n32) - PLATFORM=irix-cc - ;; - irix-64) - PLATFORM=irix-cc-64 - ;; - irix-cc-n64) - PLATFORM=irix-cc-64 - ;; solaris-64) PLATFORM=solaris-cc-64 ;; @@ -1135,14 +1123,6 @@ if [ -z "$PLATFORM" ]; then BSD/OS:*|BSD/386:*) PLATFORM=bsdi-g++ ;; - IRIX*:*) - #PLATFORM=irix-g++ - PLATFORM=irix-cc - #PLATFORM=irix-cc-64 - PLATFORM_NOTES=" - - Also available for IRIX: irix-g++ irix-cc-64 - " - ;; Linux:*|GNU:*|GNU/*:*) PLATFORM=linux-g++ PLATFORM_NOTES=" @@ -1538,30 +1518,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then CFG_XINERAMA=yes fi fi - # auto-detect tablet support (currenlty only in IRIX) - if [ "$CFG_TABLET" = "auto" ]; then - case $PLATFORM in - irix-*) - if $x11tests/xinput.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS; then - if [ "$CFG_TABLET" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "Tablet 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_TABLET=no - fi - else - CFG_TABLET=yes - fi - ;; - *) - CFG_TABLET=no - ### add error message for the "yes" case on non-IRIX systems - ;; - esac - fi + CFG_TABLET=no # Was supported only on IRIX # auto-detect XKB support if [ "$CFG_XKB" != "no" ]; then if $x11tests/xkb.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS; then @@ -1943,11 +1900,6 @@ Qt/X11 only: $XFTY -xft ............... Compile Xft support. Requires X11/Xft/Xft.h and libXft. - $XIN -no-tablet ......... Do not compile Tablet support. - $XIY -tablet ............ Compile Tablet support. - Requires IRIX with wacom.h and libXi or - XFree86 with X11/extensions/XInput.h and libXi. - $XKN -no-xkb ............ Do not compile XKB (X KeyBoard extension) support. $XKY -xkb ............... Compile XKB support. @@ -2021,22 +1973,6 @@ echo "You are licensed to use this software under the terms of" echo "the GNU General Public License (GPL) versions 2 or 3." echo -# work around for broken system header files in IRIX 6.5.18 - 6.5.22 -case "$PLATFORM" in -irix-cc*) - IRIX_VERSION=`uname -R | awk '{FS=".";print $4}' | sed s/\[m\|f\]//g` - MIPSPRO_MINOR_VERSION=`CC -version 2>&1 | awk '{FS=".";print $2}'` - if [ "$MIPSPRO_MINOR_VERSION" -gt "3" -a "$IRIX_VERSION" -ge "18" \ - -a "$IRIX_VERSION" -le "22" ]; then - QMAKE_VARS="$QMAKE_VARS \"QMAKE_CXXFLAGS+=-LANG:libc_in_namespace_std=off\"" - fi - ;; -*) - IRIX_VERSION=-1 - MIPSPRO_MINOR_VERSION=-1 - ;; -esac - # ----------------------------------------------------------------------------- # build qmake # ----------------------------------------------------------------------------- @@ -2116,10 +2052,6 @@ if true; then ###[ '!' -f "$outpath/bin/tqmake" ]; EXTRA_CFLAGS="$EXTRA_CFLAGS -D${DEF}" done fi - if [ "$MIPSPRO_MINOR_VERSION" -gt "3" \ - -a "$IRIX_VERSION" -ge "18" -a "$IRIX_VERSION" -le "22" ]; then - EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -LANG:libc_in_namespace_std=off" - fi QMAKE_BIN_DIR="$QT_INSTALL_BINS" [ -z "$QMAKE_BIN_DIR" ] && QMAKE_BIN_DIR="${QT_INSTALL_PREFIX}/bin" QMAKE_DATA_DIR="$QT_INSTALL_DATA" @@ -2477,11 +2409,6 @@ if [ "$CFG_EXCEPTION_SUPPORT" = "no" ]; then ;; cc*) case "$PLATFORM" in - irix-cc*) - QMAKE_VARS="$QMAKE_VARS \"QMAKE_CFLAGS+=-LANG:exceptions=off\"" - QMAKE_VARS="$QMAKE_VARS \"QMAKE_CXXFLAGS+=-LANG:exceptions=off\"" - QMAKE_VARS="$QMAKE_VARS \"QMAKE_LFLAGS+=-LANG:exceptions=off\"" - ;; *) ;; esac ;; @@ -2860,25 +2787,6 @@ g++*) EOF fi ;; -cc*) - case "$PLATFORM" in - irix-cc*) - if [ "$CFG_EXCEPTION_SUPPORT" != "no" ]; then - cat <<EOF - - This target is using the MIPSpro C++ compiler ($PLATFORM). - - You may choose to re-run `basename $0` with the -no-exceptions - option to compile TQt without exceptions. This will make the - size of the TQt library smaller and reduce the amount of memory - taken by your applications. - -EOF - fi - ;; - *) ;; - esac - ;; *) ;; esac |