[Libreoffice-commits] .: configure.in set_soenv.in

[Sebastian Spaeth]

 configure.in |   13 +------------
 set_soenv.in |   21 +++------------------
 2 files changed, 4 insertions(+), 30 deletions(-)

New commits:
commit 5e29621416e793e66962c095ca3069b43c6b9580
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Fri Dec 10 15:15:41 2010 +0100

    Remove obsolete gcc tests for gcc < 3.4

diff --git a/configure.in b/configure.in
index 8e1a3e0..cf113cb 100755
--- a/configure.in
+++ b/configure.in
@@ -1898,22 +1898,12 @@ COMPATH=`echo $COMPATH | $SED "s@/[[Bb]][[Ii]][[Nn]]\\\$@@"`;
 dnl ===================================================================
 dnl  Test the gcc version,  3 is OK
 dnl ===================================================================
-GCCVER=20995
 if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then
     AC_MSG_CHECKING([the GNU gcc compiler version])
    _gcc_version=`$CC -dumpversion`
    _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
    GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
 
-   if test "$_gcc_major" -lt "3"; then
-      AC_MSG_ERROR([found version "$_gcc_version", use version 3+ of the gcc compiler])
-   else
-      if test "$GCCVER" -eq "030203"; then
-        if test "$ENABLE_SYMBOLS" = "SMALL"; then
-           AC_MSG_ERROR([version "$_gcc_version" gives internal error with small.])
-        fi
-      fi
-   fi
    if test "$_os" = "Darwin" -a "$GCCVER" -ge "040100" ; then
       if test -z "$save_CC" -a -x "$GCC_HOME/bin/gcc-4.0" ; then
          CC=$GCC_HOME/bin/gcc-4.0
@@ -1938,7 +1928,6 @@ if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; th
       AC_MSG_RESULT([ok (GNU ld)])
    fi
 fi
-AC_SUBST(GCCVER)
 
 HAVE_LD_BSYMBOLIC_FUNCTIONS=
 if test "$GCC" = "yes"; then
@@ -1968,7 +1957,7 @@ if test -n "$enable_pch" && test "$enable_pch" != "no"; then
        ENABLE_PCH="TRUE"
        AC_MSG_RESULT([yes])
 dnl There is no PCH support in GCC versions prior to this
-   elif test "$GCC" = "yes" -a "$GCCVER" -gt "030400"; then
+   elif test "$GCC" = "yes"; then
        ENABLE_PCH="TRUE"
        AC_MSG_RESULT([yes])
    else
diff --git a/set_soenv.in b/set_soenv.in
index 40e31a2..798bd44 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -293,16 +293,9 @@ elsif ( $platform =~ m/netbsd/ )
    { print "Unsupported NetBSD architecture: $platform \n";
      exit 1;
    }
-   #Conditional setting depending on gcc3:
-      if (@GCCVER@ >= 30401) {
-         $CVER           = "C341";
-         $OUTPATH        = $OUTPATH."3";
-      }
-      else {
-         $CVER           = "C300";
-         $OUTPATH        = $OUTPATH."2";
-      }
    # General NetBSD settings:
+      $CVER           = "C341";
+      $OUTPATH        = $OUTPATH."3";
       $BIG_SVX        = "TRUE";
       $COM            = "GCC";
       $COMPATH        = '@COMPATH@';
@@ -399,9 +392,7 @@ elsif ( $platform =~ m/freebsd/ )
    {  print "Unsupported FreeBSD architecture: $platform \n";
          exit 1;
    }
-   if( @GCCVER@ >= 30401 ) {
       $CVER        = "C341";
-   }
       $INPATH         = $OUTPATH.$PROEXT;
 }
 elsif ( $platform =~ m/openbsd/ )
@@ -438,9 +429,7 @@ elsif ( $platform =~ m/openbsd/ )
    {  print "Unsupported OpenBSD architecture: $platform \n";
          exit 1;
    }
-   if( @GCCVER@ >= 30401 ) {
       $CVER        = "C341";
-   }
       $INPATH         = $OUTPATH.$PROEXT;
 }
 elsif ( $platform =~ m/linux/ )
@@ -818,11 +807,7 @@ elsif ( $platform =~ m/darwin/ )
           $CPUNAME        = "INTEL";
           $OUTPATH        = "unxmacxi";
       }
-      if (@GCCVER@ >= 30401) {
-	  $CVER           = "C341";
-      } else {
-	  $CVER           = "C300";
-      }
+      $CVER           = "C341";
       $GUI            = "UNX";
       $GVER           = "VCL";
       $INPATH         = $OUTPATH.$PROEXT;