Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0

  if echo $CXX | grep gcc > /dev/null 2>&1

  then

    GCC_VERSION=`gcc -v 2>&1 | grep version | sed -e 's/[[^0-9. ]]//g; s/^ *//g; s/ .*//g'`

    case $SYSTEM_TYPE in

      *freebsd*)

        # The libsupc++ library on freebsd with gcc 3.4.2 is dependent on 

        # libstdc++, disable it  since other solution works fine

        GCC_VERSION="NOSUPCPP_$GCC_VERSION"

      ;;

      *) 

      ;;

    esac

    echo "Using gcc version '$GCC_VERSION'"

    case "$GCC_VERSION" in

      3.4.*|3.5.*)