diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-23 17:13:36 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-23 17:13:36 -0500 |
commit | 2f4ee8ef5d1fe9a8daa9d342d71b021e6a25ca01 (patch) | |
tree | c7c69fbe21ff704ebb8cf74b25627111ed30efdd /experimental/tqtinterface/qt4/configure | |
parent | 5584c3586a63c9e18513e8df2d6823ec6b33dfc7 (diff) | |
download | tde-2f4ee8ef5d1fe9a8daa9d342d71b021e6a25ca01.tar.gz tde-2f4ee8ef5d1fe9a8daa9d342d71b021e6a25ca01.zip |
Apply all Qt3.3.8d patches
NOTE: This will *likely* break compilation of TQt4
Please wait a few days for fixes to be committed as needed!
Diffstat (limited to 'experimental/tqtinterface/qt4/configure')
-rwxr-xr-x | experimental/tqtinterface/qt4/configure | 134 |
1 files changed, 117 insertions, 17 deletions
diff --git a/experimental/tqtinterface/qt4/configure b/experimental/tqtinterface/qt4/configure index 3d7e39f0d..8a952c0e5 100755 --- a/experimental/tqtinterface/qt4/configure +++ b/experimental/tqtinterface/qt4/configure @@ -34,7 +34,44 @@ SUPPORTED= #------------------------------------------------------------------------------- # need that throughout the script -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +DPKG_ARCH=`(dpkg-architecture -qDEB_HOST_ARCH) 2>/dev/null` || UNAME_MACHINE=unknown +case $DPKG_ARCH in + amd64) + UNAME_MACHINE="x86_64" + ;; + arm) + UNAME_MACHINE="armv4l" + ;; + armel) + UNAME_MACHINE="armv5tel" + ;; + hppa) + UNAME_MACHINE="parisc64" + ;; + hurd-i386) + UNAME_MACHINE="i686-AT386" + ;; + i386) + UNAME_MACHINE="i686" + ;; + kfreebsd-amd64) + UNAME_MACHINE="x86_64" + ;; + kfreebsd-i386) + UNAME_MACHINE="i586" + ;; + mipsel) + UNAME_MACHINE="mips" + ;; + powerpc) + UNAME_MACHINE="ppc" + ;; + *) + UNAME_MACHINE="$DPKG_ARCH" + ;; + + +esac UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown @@ -81,7 +118,7 @@ Edition="free" Licensee="Free" Products="qt-free" -MODULES="styles tools kernel widgets dialogs iconview workspace" +MODULES="styles tools kernel widgets dialogs iconview workspace inputmethod" MODULES="$MODULES network canvas table xml opengl sql" CFG_MODULES_AVAILABLE=$MODULES QMAKE_VARS="$QMAKE_VARS \"TQT_PRODUCT=$Products\"" @@ -126,6 +163,9 @@ CFG_SQL_AVAILABLE= CFG_SQL_AUTODETECTED= CFG_GFX_AVAILABLE= CFG_STYLE_AVAILABLE= +#Keep this position for CFG_IM* to avoid patch rejection +CFG_IM=yes +CFG_IM_EXT=no CFG_TABLET=auto CFG_XKB=auto CFG_NIS=auto @@ -257,6 +297,12 @@ while [ "$#" -gt 0 ]; do VAR=fatal_error VAL=no ;; + #TQt style yes options for immodule + #Keep this place to avoid patch rejection + -inputmethod|-inputmethod-ext) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + VAL=yes + ;; -embedded) VAR=embedded # this option may or may not be followed by an argument @@ -876,6 +922,20 @@ while [ "$#" -gt 0 ]; do dlopen-opengl) CFG_DLOPEN_OPENGL="$VAL" ;; + inputmethod) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_IM="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; + inputmethod-ext) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_IM_EXT="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; *) UNKNOWN_OPT=yes ;; @@ -1181,7 +1241,7 @@ if [ "$CFG_EMBEDDED" != "no" ]; then XPLATFORM="qws/solaris-$CFG_EMBEDDED-g++" fi ;; - Linux:*) + Linux:*|GNU:*|GNU/*:*) if [ -z "$PLATFORM" ]; then case "$UNAME_MACHINE" in *86) @@ -1236,9 +1296,6 @@ if [ -z "$PLATFORM" ]; then QNX:*) PLATFORM=qnx-g++ ;; - GNU:*) - PLATFORM=hurd-g++ - ;; dgux:*) PLATFORM=dgux-g++ ;; @@ -1285,7 +1342,7 @@ if [ -z "$PLATFORM" ]; then - Also available for Tru64: tru64-g++ " ;; - Linux:*) + Linux:*|GNU:*|GNU/*:*) PLATFORM=linux-g++ PLATFORM_NOTES=" - Also available for Linux: linux-kcc linux-icc linux-cxx @@ -1482,7 +1539,7 @@ if echo $MODULES | grep sql >/dev/null; then ODBC_REQ="-lodbc sql.h sqlext.h" TDS_REQ="-lsybdb sybfront.h sybdb.h" DB2_REQ="-ldb2 sqlcli.h sqlcli1.h" - IBASE_REQ="-lgds ibase.h" + IBASE_REQ="-lfbclient ibase.h" for _SQLDR in $CFG_SQL_AVAILABLE; do case $_SQLDR in mysql) @@ -1755,6 +1812,13 @@ if [ "$PLATFORM_QWS" = "yes" ]; then CFG_GFX_AVAILABLE=`echo $CFG_GFX_AVAILABLE` fi +# immodule extensions +if [ "$CFG_IM" = "no" ]; then + CFG_IM_EXT=no +fi +if [ "$CFG_IM_EXT" = "yes" ]; then + CFG_IM=yes +fi #------------------------------------------------------------------------------- # help - interactive parts of the script _after_ this section please @@ -2062,6 +2126,20 @@ if [ "$PLATFORM_X11" = "yes" ]; then XKY="*" XKN=" " fi + if [ "$CFG_IM" = "no" ]; then + IMY=" " + IMN="*" + else + IMY="*" + IMN=" " + fi + if [ "$CFG_IM_EXT" = "no" ]; then + IXY=" " + IXN="*" + else + IXY="*" + IXN=" " + fi cat << EOF Qt/X11 only: @@ -2110,6 +2188,14 @@ Qt/X11 only: -dlopen-opengl ..... Qt uses dlopen(3) to resolve OpenGL functions (instead of linking with OpenGL libraries directly). + $IMN -no-inputmethod .... Do not compile immodule (extensible input method) + support. + $IMY -inputmethod ....... Compile immodule support. + + $IXN -no-inputmethod-ext Do not compile more immodule extensions support. + $IXY -inputmethod-ext ... Compile more immodule extensions support. + (breaks ABI with standard TQt3). + EOF fi @@ -2665,6 +2751,16 @@ if [ "$PLATFORM_X11" = "yes" ]; then if [ "$CFG_XKB" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG xkb" fi + if [ "$CFG_IM" = "yes" ]; then + TQMAKE_CONFIG="$TQMAKE_CONFIG inputmethod" + elif [ "$CFG_IM" = "no" ]; then + TQCONFIG_FLAGS="$TQCONFIG_FLAGS TQT_NO_IM" + fi + if [ "$CFG_IM_EXT" = "yes" ]; then + TQMAKE_CONFIG="$TQMAKE_CONFIG inputmethod-ext" + elif [ "$CFG_IM_EXT" = "no" ]; then + TQCONFIG_FLAGS="$TQCONFIG_FLAGS TQT_NO_IM_EXTENSIONS" + fi elif [ "$PLATFORM_MAC" = "yes" ]; then if [ "$CFG_TABLET" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG tablet" @@ -2760,15 +2856,15 @@ case "$COMPILER" in g++*) # GNU C++ QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"` - COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null` + COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null | sed 's,^[^0-9]*,,g'` case "$COMPILER_VERSION" in - *2.95.*) + 2.95.*) COMPILER_VERSION="2.95.*" ;; - *3.*) + 3.*) COMPILER_VERSION="3.*" ;; - *4.*) + 4.*) COMPILER_VERSION="4" ;; *) @@ -2789,7 +2885,7 @@ esac # minimal-config small-config medium-config large-config full-config # # Modules: -# styles tools kernel widgets dialogs iconview workspace +# styles tools kernel widgets dialogs iconview workspace inputmethod # # Enterprise/Open Source edition modules: # network canvas table xml opengl sql @@ -2797,6 +2893,8 @@ esac # Options: # stl # +# X11 : inputmethod-ext +# # Things that do not affect the Qt API/ABI: # system-jpeg no-jpeg jpeg # system-mng no-mng mng @@ -2818,10 +2916,10 @@ esac # tablet # ipv6 # -# X11 : xftnameunparse x11sm xinerama xcursor xrandr xrender xftfreetype xkb +# X11 : xftnameunparse x11sm xinerama xcursor xrandr xrender xftfreetype xkb inputmethod # Embedded: embedded ft # -ALL_OPTIONS="styles tools kernel widgets dialogs iconview workspace network canvas table xml opengl sql stl" +ALL_OPTIONS="styles tools kernel widgets dialogs iconview workspace inputmethod network canvas table xml opengl sql stl" BUILD_CONFIG= BUILD_OPTIONS= @@ -2835,7 +2933,7 @@ for config_option in $QMAKE_CONFIG; do BUILD_CONFIG="$config_option" ;; - styles|tools|kernel|widgets|dialogs|iconview|workspace|network|canvas|table|xml|opengl|sql|stl) + styles|tools|kernel|widgets|dialogs|iconview|workspace|inputmethod|network|canvas|table|xml|opengl|sql|stl) # these config options affect the Qt API/ABI. they should influence # the generation of the buildkey, so we don't skip them SKIP="no" @@ -3182,6 +3280,8 @@ if [ "$PLATFORM_X11" = "yes" ]; then echo "XRender support ..... $CFG_XRENDER" echo "Xft support ......... $CFG_FREETYPE" echo "XKB Support ......... $CFG_XKB" + echo "immodule support .... $CFG_IM" + echo "immodule ext support $CFG_IM_EXT" elif [ "$PLATFORM_MAC" = "yes" ]; then echo "Accessibility ....... $CFG_ACCESSIBILITY" echo "Tablet support ...... $CFG_TABLET" @@ -3207,7 +3307,7 @@ EXEC="" echo "Finding project files. Please wait..." if [ -z "$QMAKE_PROJECTS" ]; then - QMAKE_PROJECTS=`find $relpath/. -name '*.pro' -print | sed 's-/\./-/-'` + QMAKE_PROJECTS=`find $relpath/. -name '.pc' -prune -o -name '*.pro' -print | sed 's-/\./-/-'` else TQT_PROJECTS= for a in `echo $QMAKE_PROJECTS`; do |