--- configure	2005-01-15 11:17:17.000000000 -0800
+++ configure	2007-09-22 18:17:38.000000000 -0700
@@ -5087,7 +5087,7 @@
 				TLIBS="$TLIBS -lgmp"
 				echo "#include \"gmp.h\"" >foo.c
 				echo "int main() {return 0;}" >>foo.c
-				MP_INCLUDE=`cpp foo.c | $AWK '/(\/|\\\\)gmp.h/ {if (!i) print $3;i=1}' | tr -d '"'`
+				MP_INCLUDE=`$CPP $CPPFLAGS foo.c | $AWK '/(\/|\\\\)gmp.h/ {if (!i) print $3;i=1}' | tr -d '"'`
 				rm -f foo.c
 else
   echo "Cannot use dynamic gmp lib"
@@ -9043,16 +9043,16 @@
    if test -f ${TCL_CONFIG_PREFIX}/../include/tcl.h ; then
       TCL_INCLUDE=-I${TCL_CONFIG_PREFIX}/../include
    else
-      if test -f /usr/include/tcl${TCL_VERSION}/tcl.h ; then
-        TCL_INCLUDE=-I/usr/include/tcl${TCL_VERSION}
+      if test -f ${TCL_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION}/tcl.h ; then
+        TCL_INCLUDE=-I${TCL_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION}
       fi
    fi
 
    if test -f ${TK_CONFIG_PREFIX}/../include/tk.h ; then
       TK_INCLUDE=-I${TK_CONFIG_PREFIX}/../include
    else
-      if test -f /usr/include/tcl${TCL_VERSION}/tk.h ; then
-        TK_INCLUDE=-I/usr/include/tcl${TCL_VERSION}
+      if test -f ${TK_CONFIG_PREFIX}/../../include/tk${TCL_VERSION}/tk.h ; then
+        TK_INCLUDE=-I${TK_CONFIG_PREFIX}/../../include/tk${TCL_VERSION}
       fi
    fi