--- configure.orig	2008-07-25 13:42:43 UTC
+++ configure
@@ -3667,8 +3667,6 @@ fi
 #
 
 
-CXXFLAGS=`echo " $CXXFLAGS " | sed -e 's/ -g / /g' -e 's/ -O[0-9]* / /g'`
-CFLAGS=`echo " $CFLAGS " | sed -e 's/ -g / /g' -e 's/ -O[0-9]* / /g'`
 
 if test X"$use_opt" != Xno; then
   CXXFLAGS="$CONF_OPT_FLAGS $CXXFLAGS"
@@ -4517,7 +4515,7 @@ if test $? = 0; then
 fi
 rm -rf conftest*
   if test X"$TCL_VERSION" != X; then
-        TCL_VERSION=`echo $TCL_VERSION | tr -d \"`
+        TCL_VERSION=`echo $TCL_VERSION | tr -d \" | tr -d \.`
     TCL_LIBS=-ltcl$TCL_VERSION
     HAVE_TCL=yes
     echo "$ac_t""$TCL_VERSION" 1>&6
@@ -11917,13 +11915,11 @@ else
 #include <stdlib.h>
 #endif
 
-int
-main()
-{
 #define OPENSSL_THREAD_DEFINES
 #undef THREADS
 #undef OPENSSL_THREADS
 #include <openssl/opensslconf.h>
+int main() {
 #if !defined(THREADS) && !defined(OPENSSL_THREADS)
 //error You are trying to build multi-threaded MICO with single-threaded OpenSSL!
 return 1;
