FCL/sf/mw/qt: comparison configure

equal deleted inserted replaced

-:41300fa6a67c
+:2f34d5167611
 #!/bin/sh
 #############################################################################
 ##
-## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ## All rights reserved.
 ## Contact: Nokia Corporation (qt-info@nokia.com)
 ##
 ## This file is the build configuration utility of the Qt Toolkit.
 ##
 while read line; do case "$line" in
 include*)
 	    inc_file=`echo "$line" | sed -n -e "/^include.*(.*)/s/include.*(\(.*\)).*$/\1/p"`
 	    current_dir=`dirname "$1"`
 	    conf_file="$current_dir/$inc_file"
-	    if [ ! -e  "$conf_file" ]; then
+	    if [ ! -f  "$conf_file" ]; then
 echo "WARNING: Unable to find file $conf_file" >&2
 continue
 fi
 getQMakeConf1 "$conf_file"
 ;;
 rm -f "$outpath/bin/syncqt"
 if [ -x "$relpath/bin/syncqt" ]; then
 mkdir -p "$outpath/bin"
 echo "#!/bin/sh" >"$outpath/bin/syncqt"
 echo "QTDIR=\"$relpath\"; export QTDIR" >>"$outpath/bin/syncqt"
-echo "perl \"$relpath/bin/syncqt\" -outdir \"$outpath\" $*" >>"$outpath/bin/syncqt"
+echo "perl \"$relpath/bin/syncqt\" -outdir \"$outpath\" \"\$@\"" >>"$outpath/bin/syncqt"
 chmod 755 "$outpath/bin/syncqt"
 fi
 # symlink the mkspecs directory
 mkdir -p "$outpath/mkspecs"
 rm -f "$outpath/tools/porting/src/q3porting.xml"
 ln -s "$relpath/tools/porting/src/q3porting.xml" "$outpath/tools/porting/src"
 fi
 # symlink fonts to be able to run application from build directory
-if [ "$PLATFORM_QWS" = "yes" ] && [ ! -e "${outpath}/lib/fonts" ]; then
+if [ "$PLATFORM_QWS" = "yes" ] && [ ! -d "${outpath}/lib/fonts" ]; then
 if [ "$PLATFORM" = "$XPLATFORM" ]; then
 mkdir -p "${outpath}/lib"
 ln -s "${relpath}/lib/fonts" "${outpath}/lib/fonts"
 fi
 fi
 *  -release ........... Compile and link Qt with debugging turned off.
 -debug ............. Compile and link Qt with debugging turned on.
 -debug-and-release . Compile and link two versions of Qt, with and without
 debugging turned on (Mac only).
--developer-build.... Compile and link Qt with Qt developer options (including auto-tests exporting)
+-developer-build ... Compile and link Qt with Qt developer options (including auto-tests exporting)
--opensource......... Compile and link the Open-Source Edition of Qt.
+-opensource ........ Compile and link the Open-Source Edition of Qt.
--commercial......... Compile and link the Commercial Edition of Qt.
+-commercial ........ Compile and link the Commercial Edition of Qt.
 *  -shared ............ Create and use shared Qt libraries.
 -static ............ Create and use static Qt libraries.
 $FCGN  -no-fontconfig ..... Do not compile FontConfig (anti-aliased font) support.
 $FCGY  -fontconfig ........ Compile FontConfig support.
 Requires fontconfig/fontconfig.h, libfontconfig,
 freetype.h and libfreetype.
-$XIN  -no-xinput.......... Do not compile Xinput support.
+$XIN  -no-xinput ......... Do not compile Xinput support.
 $XIY  -xinput ............ Compile Xinput support. This also enabled tablet support
 which 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.
 # OpenGL ES 1.x common lite
 	"$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1cl "OpenGL ES 1.x Lite" $L_FLAGS $I_FLAGS $l_FLAGS
 if [ $? != "0" ]; then
 	    echo "The OpenGL ES 1.x Common Lite Profile functionality test failed!"
 echo " You might need to modify the include and library search paths by editing"
-echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+echo " QMAKE_INCDIR_OPENGL_ES1CL, QMAKE_LIBDIR_OPENGL_ES1CL and QMAKE_LIBS_OPENGL_ES1CL in"
 echo " ${XQMAKESPEC}."
 exit 1
 fi
 elif [ "$CFG_OPENGL" = "es1" ]; then
 # OpenGL ES 1.x
 	"$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS
 if [ $? != "0" ]; then
 	    echo "The OpenGL ES 1.x functionality test failed!"
 echo " You might need to modify the include and library search paths by editing"
-echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+echo " QMAKE_INCDIR_OPENGL_ES1, QMAKE_LIBDIR_OPENGL_ES1 and QMAKE_LIBS_OPENGL_ES1 in"
 echo " ${XQMAKESPEC}."
 exit 1
 fi
 elif [ "$CFG_OPENGL" = "es2" ]; then
 #OpenGL ES 2.x
 	"$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS
 if [ $? != "0" ]; then
 	    echo "The OpenGL ES 2.0 functionality test failed!"
 echo " You might need to modify the include and library search paths by editing"
-echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+echo " QMAKE_INCDIR_OPENGL_ES2, QMAKE_LIBDIR_OPENGL_ES2 and QMAKE_LIBS_OPENGL_ES2 in"
 echo " ${XQMAKESPEC}."
 exit 1
 fi
 elif [ "$CFG_OPENGL" = "desktop" ]; then
 # Desktop OpenGL support
 OPENSSL_LINKAGE="(run-time)"
 elif [ "$CFG_OPENSSL" = "linked" ]; then
 OPENSSL_LINKAGE="(linked)"
 fi
 echo "OpenSSL support ..... $CFG_OPENSSL $OPENSSL_LINKAGE"
+echo "Alsa support ........ $CFG_ALSA"
+echo
 [ "$CFG_PTMALLOC" != "no" ] && echo "Use ptmalloc ........ $CFG_PTMALLOC"
 # complain about not being able to use dynamic plugins if we are using a static build
 if [ "$CFG_SHARED" = "no" ]; then
 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_DEBUG" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "no" ]; then
 echo
 echo "NOTE: Mac OS X frameworks implicitly build debug and release Qt libraries."
 echo
 fi
-echo "alsa support ........ $CFG_ALSA"
-echo
 sepath=`echo "$relpath" | sed -e 's/\\./\\\\./g'`
 PROCS=1
 EXEC=""

changeset 18	2f34d5167611
parent 3	41300fa6a67c
child 22	79de32ba3296