--- configure 2006-01-03 10:12:46 -0000 +++ configure 2006-01-03 10:12:46 -0000 @@ -370,7 +370,6 @@ CFG_QCONFIG=full CFG_EMBEDDED=no CFG_DEBUG=auto -CFG_BUILD_ALL=yes CFG_DEBUG_RELEASE=no CFG_SHARED=yes CFG_SM=auto @@ -1297,14 +1296,12 @@ fi # detect build style -if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then - QMAKE_CONFIG="$QMAKE_CONFIG build_all" -elif [ "$CFG_DEBUG" = "auto" ]; then +if [ "$CFG_DEBUG" = "auto" ]; then CFG_DEBUG_RELEASE=yes CFG_DEBUG=yes +fi +if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG build_all" -else - CFG_BUILD_ALL=no fi # if the source tree is different from the build tree, @@ -4174,7 +4171,16 @@ [ "$CFG_INCREMENTAL" = "yes" ] && [ '!' -z "$INCREMENTAL" ] && echo "Incremental ......... $INCREMENTAL" echo "Configuration ....... $QMAKE_CONFIG $QT_CONFIG" -echo "Debug................ $CFG_DEBUG" +if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then + echo "Debug................ yes (combined)" + if [ "$CFG_DEBUG" = "yes" ]; then + echo "Default Link......... debug" + else + echo "Default Link......... release" + fi +else + echo "Debug................ $CFG_DEBUG" +fi echo "Qt3 compatibility.... $CFG_QT3SUPPORT" echo "STL support ......... $CFG_STL" echo "PCH support ......... $CFG_PRECOMPILE" @@ -4452,7 +4458,7 @@ # WARNING: This makefile will be replaced with a real makefile. # All changes made to this file will be lost. EOF - [ "$CFG_BUILD_ALL" = "no" ] && echo "first_target: first" >>${OUTDIR}/Makefile + [ "$CFG_DEBUG_RELEASE" = "no" ] && echo "first_target: first" >>${OUTDIR}/Makefile cat >>${OUTDIR}/Makefile <<EOF all clean install qmake first Makefile: FORCE