diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 80 |
1 files changed, 40 insertions, 40 deletions
@@ -1080,7 +1080,7 @@ done [ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools cat > $outpath/src/tools/qconfig.cpp.new <<EOF /* Install paths from configure */ -#include "qglobal.h" +#include "ntqglobal.h" static const char QT_INSTALL_PREFIX [267] = "qt_nstpath=$QT_INSTALL_PREFIX"; static const char QT_INSTALL_BINS [267] = "qt_binpath=$QT_INSTALL_BINS"; @@ -1125,18 +1125,18 @@ WHICH=$unixtests/which.test ### skip this if the user just needs help... if [ "$OPT_HELP" != "yes" ]; then -# create the include and include/qmake directory (for qconfig.h and qmodules.h) +# create the include and include/qmake directory (for ntqconfig.h and ntqmodules.h) [ -d $outpath/include/qmake ] || mkdir -p $outpath/include/qmake -# create temporary qconfig.h for compiling qmake +# create temporary ntqconfig.h for compiling qmake # when building qmake, we use #defines for the install paths, # however they are real functions in the library -cat >>$outpath/include/qmake/qconfig.h <<EOF +cat >>$outpath/include/qmake/ntqconfig.h <<EOF /* All features enabled while building qmake */ EOF -# create temporary qmodules.h for compiling qmake -cat >>$outpath/include/qmake/qmodules.h <<EOF +# create temporary ntqmodules.h for compiling qmake +cat >>$outpath/include/qmake/ntqmodules.h <<EOF /* All modules enabled while building qmake */ EOF @@ -2043,7 +2043,7 @@ Configure options: * -no-gif ............ Do not compile in GIF reading support. -qt-gif ............ Compile in GIF reading support. - See src/kernel/qgif.h + See src/kernel/ntqgif.h * -qt-zlib ........... Use the zlib bundled with Qt. -system-zlib ....... Use zlib from the operating system. @@ -2712,9 +2712,9 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; (cd $outpath/qmake; $MAKE || (echo "qmake failed to build. Aborting." && exit 2)) || exit 2 fi -# clean up temporary qconfig.h and qmodules.h -rm -f $outpath/include/qmake/qconfig.h -rm -f $outpath/include/qmake/qmodules.h +# clean up temporary ntqconfig.h and ntqmodules.h +rm -f $outpath/include/qmake/ntqconfig.h +rm -f $outpath/include/qmake/ntqmodules.h rmdir $outpath/include/qmake @@ -3114,27 +3114,27 @@ if [ "$CFG_EXCEPTION_SUPPORT" = "no" ]; then fi #------------------------------------------------------------------------------- -# part of configuration information goes into qmodules.h +# part of configuration information goes into ntqmodules.h #------------------------------------------------------------------------------- -rm -f $outpath/include/qmodules.h.new -cat >$outpath/include/qmodules.h.new << EOF +rm -f $outpath/include/ntqmodules.h.new +cat >$outpath/include/ntqmodules.h.new << EOF /* These modules are present in this configuration of Qt */ EOF for MODULE in $MODULES; do if [ -d "$relpath/src/$MODULE" ]; then M=`echo $MODULE | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - echo "#define QT_MODULE_$M" >>$outpath/include/qmodules.h.new + echo "#define QT_MODULE_$M" >>$outpath/include/ntqmodules.h.new fi done -# avoid unecessary rebuilds by copying only if qmodules.h has changed -if cmp -s $outpath/include/qmodules.h $outpath/include/qmodules.h.new; then - rm -f $outpath/include/qmodules.h.new +# avoid unecessary rebuilds by copying only if ntqmodules.h has changed +if cmp -s $outpath/include/ntqmodules.h $outpath/include/ntqmodules.h.new; then + rm -f $outpath/include/ntqmodules.h.new else - [ -f $outpath/include/qmodules.h ] && chmod +w $outpath/include/qmodules.h - mv -f $outpath/include/qmodules.h.new $outpath/include/qmodules.h - chmod -w $outpath/include/qmodules.h + [ -f $outpath/include/ntqmodules.h ] && chmod +w $outpath/include/ntqmodules.h + mv -f $outpath/include/ntqmodules.h.new $outpath/include/ntqmodules.h + chmod -w $outpath/include/ntqmodules.h fi #------------------------------------------------------------------------------- @@ -3289,20 +3289,20 @@ QT_BUILD_KEY="$CFG_USER_BUILD_KEY $UNAME_MACHINE $UNAME_SYSTEM $COMPILER $BUILD_ QT_BUILD_KEY=`echo $QT_BUILD_KEY | sed -e "s, *, ,g" -e "s,^ *,," -e "s, *$,,"` #------------------------------------------------------------------------------- -# part of configuration information goes into qconfig.h +# part of configuration information goes into ntqconfig.h #------------------------------------------------------------------------------- case "$CFG_QCONFIG" in full) - echo "/* Everything */" >$outpath/include/qconfig.h.new + echo "/* Everything */" >$outpath/include/ntqconfig.h.new ;; *) QCONFIGFILE=qconfig-$CFG_QCONFIG.h - echo "/* Copied from $QCONFIGFILE */" >$outpath/include/qconfig.h.new - cat $relpath/src/tools/$QCONFIGFILE >>$outpath/include/qconfig.h.new + echo "/* Copied from $QCONFIGFILE */" >$outpath/include/ntqconfig.h.new + cat $relpath/src/tools/$QCONFIGFILE >>$outpath/include/ntqconfig.h.new ;; esac -cat >> $outpath/include/qconfig.h.new <<EOF +cat >> $outpath/include/ntqconfig.h.new <<EOF /* License information */ #define QT_PRODUCT_LICENSEE "$Licensee" @@ -3316,7 +3316,7 @@ cat >> $outpath/include/qconfig.h.new <<EOF #define Q_LITTLE_ENDIAN 1234 EOF if [ "$CFG_ENDIAN" = "auto" ]; then -cat >> $outpath/include/qconfig.h.new << EOF +cat >> $outpath/include/ntqconfig.h.new << EOF #if defined(__BIG_ENDIAN__) # define Q_BYTE_ORDER Q_BIG_ENDIAN #elif defined(__LITTLE_ENDIAN__) @@ -3326,26 +3326,26 @@ cat >> $outpath/include/qconfig.h.new << EOF #endif EOF else -echo "#define Q_BYTE_ORDER $CFG_ENDIAN" >> $outpath/include/qconfig.h.new +echo "#define Q_BYTE_ORDER $CFG_ENDIAN" >> $outpath/include/ntqconfig.h.new fi -cat >> $outpath/include/qconfig.h.new << EOF +cat >> $outpath/include/ntqconfig.h.new << EOF /* Compile time features */ EOF -[ '!' -z "$LicenseKey" ] && echo "#define QT_PRODUCT_LICENSEKEY \"$LicenseKey\"" >>$outpath/include/qconfig.h.new +[ '!' -z "$LicenseKey" ] && echo "#define QT_PRODUCT_LICENSEKEY \"$LicenseKey\"" >>$outpath/include/ntqconfig.h.new if [ "$CFG_LARGEFILE" = "yes" ]; then - echo "#define QT_LARGEFILE_SUPPORT 64" >>$outpath/include/qconfig.h.new + echo "#define QT_LARGEFILE_SUPPORT 64" >>$outpath/include/ntqconfig.h.new if [ "$CFG_NEWABI" = "yes" ]; then - echo "#define QT_ABI_QT4 1" >>$outpath/include/qconfig.h.new + echo "#define QT_ABI_QT4 1" >>$outpath/include/ntqconfig.h.new fi fi $unixtests/ptrsize.test $XQMAKESPEC $OPT_VERBOSE $relpath $outpath -echo "#define QT_POINTER_SIZE $?" >>$outpath/include/qconfig.h.new +echo "#define QT_POINTER_SIZE $?" >>$outpath/include/ntqconfig.h.new if [ ! -z "$QT_MAC_VERSION" ]; then - echo "#define QT_MACOSX_VERSION ${QT_MAC_VERSION} /*from config.tests*/" >>$outpath/include/qconfig.h.new + echo "#define QT_MACOSX_VERSION ${QT_MAC_VERSION} /*from config.tests*/" >>$outpath/include/ntqconfig.h.new fi ## find excluded styles and add this to $QCONFIG_FLAGS @@ -3380,7 +3380,7 @@ done if [ -n "$QCONFIG_FLAGS" ]; then for cfg in $QCONFIG_FLAGS; do -cat >>$outpath/include/qconfig.h.new << EOF +cat >>$outpath/include/ntqconfig.h.new << EOF #ifndef $cfg # define $cfg #endif @@ -3389,13 +3389,13 @@ EOF done fi -# avoid unecessary rebuilds by copying only if qconfig.h has changed -if cmp -s $outpath/include/qconfig.h $outpath/include/qconfig.h.new; then - rm -f $outpath/include/qconfig.h.new +# avoid unecessary rebuilds by copying only if ntqconfig.h has changed +if cmp -s $outpath/include/ntqconfig.h $outpath/include/ntqconfig.h.new; then + rm -f $outpath/include/ntqconfig.h.new else - [ -f $outpath/include/qconfig.h ] && chmod +w $outpath/include/qconfig.h - mv $outpath/include/qconfig.h.new $outpath/include/qconfig.h - chmod -w $outpath/include/qconfig.h + [ -f $outpath/include/ntqconfig.h ] && chmod +w $outpath/include/ntqconfig.h + mv $outpath/include/ntqconfig.h.new $outpath/include/ntqconfig.h + chmod -w $outpath/include/ntqconfig.h fi |