$FreeBSD$

--- ../ecos/host/tools/configtool/standalone/common/configure.orig	Wed Feb 12 18:22:46 2003
+++ ../ecos/host/tools/configtool/standalone/common/configure	Tue Mar 27 19:37:15 2007
@@ -1502,7 +1502,7 @@
 
         if test "${GCC}" = "yes" ; then
         ecos_CFLAGS="${ecos_CFLAGS} -pipe -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs"
-        ecos_CXXFLAGS="${ecos_CXXFLAGS} -pipe -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Woverloaded-virtual"
+        ecos_CXXFLAGS="${ecos_CXXFLAGS} -pipe -Wall -Wpointer-arith -Wcast-qual -Woverloaded-virtual"
     elif test "${MSVC}" = "yes" ; then
         ecos_CFLAGS="${ecos_CFLAGS} -nologo -W3"
         ecos_CXXFLAGS="${ecos_CXXFLAGS} -nologo -W3 -GR -GX"
@@ -2076,61 +2076,6 @@
 
 	    	    possibles=`echo ${possibles} | sed -e 's,tcl,tk,g'`
 	    
-    tkconfig=""
-    for i in ${possibles}; do
-        if test -r "$i/"tkConfig.sh""; then
-            tkconfig=$i
-            break
-        fi
-    done
-
-	    if test \! -r "${tkconfig}/tkConfig.sh" ; then
-		{ echo "configure: error: unable to locate Tk config file tkConfig.sh" 1>&2; exit 1; }
-	    else
-		. ${tkconfig}/tkConfig.sh
-		if test -z "${TK_INC_DIR}" ; then
-		    if test "${TK_PREFIX}" = "/usr" ; then
-			ecos_tk_includes="${TK_XINCLUDES}"
-		    else
-			ecos_tk_includes="-I${TK_PREFIX}/include ${TK_XINCLUDES}"
-		    fi
-		else
-		    ecos_tk_includes="-I${TK_INC_DIR} ${TK_XINCLUDES}"
-		fi
-
-				if test -z "${TK_LIB_SPEC}" -a "${with_tcl_version+set}" = set ; then
-		    
-    libtk=""
-    for i in ${possibles}; do
-        if test -r "$i/"libtk${with_tcl_version}.a""; then
-            libtk=$i
-            break
-        fi
-    done
-
-		    if test -r "${libtk}/libtk${with_tcl_version}.a" ; then
-			TK_LIB_SPEC="-L${libtk} -ltk${with_tcl_version}"
-		    fi
-		fi
-		if test -z "${TK_LIB_SPEC}" ; then
-		    
-    libtk=""
-    for i in ${possibles}; do
-        if test -r "$i/"libtk.a""; then
-            libtk=$i
-            break
-        fi
-    done
-
-		    if test -r "${libtk}/libtk.a" ; then
-			TK_LIB_SPEC="-L${libtk} -ltk"
-		    fi
-		fi
-		if test -z "${TK_LIB_SPEC}" ; then
-		    { echo "configure: error: ${tkconfig}/tkConfig.sh does not define TK_LIB_SPEC" 1>&2; exit 1; }
-		fi
-		ecos_tk_libs="${TK_LIB_SPEC} ${TK_LIBS}"
-	    fi
 	fi
     fi