configure: delete some dead code and outdated comments

Change-Id: I764a9b383176e1fe9573790547ce0e12d1f88261
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 3 insertions, 38 deletions

diff --git a/configure b/configure
index 612ed4bf53..5a5f564abb 100755
--- a/configure
+++ b/configure
@@ -399,7 +399,6 @@ HostVar()
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 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
 
 # detect the "echo without newline" style. usage: echo $ECHO_N "<string>$ECHO_C"
 if echo '\c' | grep '\c' >/dev/null; then
@@ -512,8 +511,6 @@ QT_HOST_LIBS=
 QT_HOST_DATA=
 QT_EXT_PREFIX=
 
-# default qpa platform
-
 # Android vars
 CFG_DEFAULT_ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT
 CFG_DEFAULT_ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT
@@ -529,7 +526,6 @@ CFG_DEFAULT_ANDROID_NDK_HOST=$ANDROID_NDK_HOST
 # parse the arguments, setting things to "yes" or "no"
 while [ "$#" -gt 0 ]; do
     CURRENT_OPT="$1"
-    UNKNOWN_ARG=no
     case "$1" in
     #Autoconf style options
     --enable-*)
@@ -658,10 +654,6 @@ while [ "$#" -gt 0 ]; do
     extprefix)
         QT_EXT_PREFIX="$VAL"
         ;;
-    pkg-config)
-        ;;
-    force-pkg-config)
-        ;;
     docdir)
         QT_INSTALL_DOCS="$VAL"
         ;;
@@ -1314,8 +1306,6 @@ if [ "$OPT_SHADOW" = "yes" ]; then
     [ "$OPT_VERBOSE" = "yes" ] && echo "Performing shadow build..."
 fi
 
-# if the source tree is different from the build tree,
-# symlink or copy part of the sources
 if [ "$OPT_SHADOW" = "yes" ]; then
     echo "Preparing build tree..."
 
@@ -1628,35 +1618,21 @@ setBootstrapVariable()
 }
 
 # build qmake
-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
     echo "Creating qmake..."
-
     mkdir -p "$outpath/qmake" || exit
-    # fix makefiles
-    for mkfile in GNUmakefile Makefile; do
-        EXTRA_LFLAGS=
-        EXTRA_CFLAGS=
-        in_mkfile="${mkfile}.in"
-        if [ "$mkfile" = "Makefile" ]; then
-#           if which qmake >/dev/null 2>&1 && [ -f qmake/qmake.pro ]; then
-#               (cd qmake && qmake) >/dev/null 2>&1 && continue
-#           fi
-            in_mkfile="${mkfile}.unix"
-        fi
-        in_mkfile="$relpath/qmake/$in_mkfile"
-        mkfile="$outpath/qmake/$mkfile"
+
+        in_mkfile=$relpath/qmake/Makefile.unix
+        mkfile=$outpath/qmake/Makefile
         if [ -f "$mkfile" ]; then
             [ "$CFG_DEV" = "yes" ] && "$WHICH" chflags >/dev/null 2>&1 && chflags nouchg "$mkfile"
             rm -f "$mkfile"
         fi
-        [ -f "$in_mkfile" ] || continue
 
         echo "########################################################################" > "$mkfile"
         echo "## This file was autogenerated by configure, all changes will be lost ##" >> "$mkfile"
         echo "########################################################################" >> "$mkfile"
         EXTRA_OBJS=
         EXTRA_SRCS=
-        EXTRA_CFLAGS="\$(QMAKE_CFLAGS) \$(QMAKE_CFLAGS_SPLIT_SECTIONS)"
         EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS) \$(QMAKE_CXXFLAGS_CXX11) \$(QMAKE_CXXFLAGS_SPLIT_SECTIONS)"
         EXTRA_LFLAGS="\$(QMAKE_LFLAGS) \$(QMAKE_LFLAGS_GCSECTIONS)"
 
@@ -1667,8 +1643,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
         [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
         setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM"
         setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM"
-        setBootstrapVariable QMAKE_CFLAGS
-        setBootstrapVariable QMAKE_CFLAGS_SPLIT_SECTIONS
         setBootstrapVariable QMAKE_CXXFLAGS
         setBootstrapVariable QMAKE_CXXFLAGS_CXX11
         setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS
@@ -1676,20 +1650,15 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
         setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS
 
         if [ "$CFG_DEBUG" = "no" ] || [ "$CFG_RELEASE_TOOLS" = "yes" ]; then
-            setBootstrapVariable QMAKE_CFLAGS_RELEASE
             setBootstrapVariable QMAKE_CXXFLAGS_RELEASE
-            EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_RELEASE)"
             EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)"
         else
-            setBootstrapVariable QMAKE_CFLAGS_DEBUG
             setBootstrapVariable QMAKE_CXXFLAGS_DEBUG
-            EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)"
             EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)"
         fi
 
         case `basename "$PLATFORM"` in
         win32-g++*)
-            EXTRA_CFLAGS="$EXTRA_CFLAGS -DUNICODE"
             EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -DUNICODE"
             EXTRA_OBJS="qfilesystemengine_win.o \
                         qfilesystemiterator_win.o \
@@ -1726,7 +1695,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
             echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile"
             EXTRA_LFLAGS="$EXTRA_LFLAGS \$(COCOA_LFLAGS)"
             EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
-            EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS)"
             EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
             EXTRA_OBJS="$EXTRA_OBJS \
                         qsettings_mac.o \
@@ -1757,7 +1725,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
         echo "QT_MAJOR_VERSION = $QT_MAJOR_VERSION" >> "$mkfile"
         echo "QT_MINOR_VERSION = $QT_MINOR_VERSION" >> "$mkfile"
         echo "QT_PATCH_VERSION = $QT_PATCH_VERSION" >> "$mkfile"
-        echo "EXTRA_CFLAGS = $EXTRA_CFLAGS" >> "$mkfile"
         echo "EXTRA_CXXFLAGS = $EXTRA_CXXFLAGS" >> "$mkfile"
         echo "QTOBJS =" $EXTRA_OBJS >> "$mkfile"
         echo "QTSRCS =" $EXTRA_SRCS >> "$mkfile"
@@ -1779,7 +1746,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
                 rm "$mkfile.tmp"
             fi
         fi
-    done
 
     if [ "$OPT_VERBOSE" = yes ]; then
         # Show the output of make
@@ -1797,7 +1763,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
         fi
         echo "Done."
     fi
-fi # Build qmake
 
 #-------------------------------------------------------------------------------
 # create a qt.conf for the Qt build tree itself