--- Python-2.5c1/configure	2006-08-09 08:56:33.000000000 -0600
+++ /Users/bwaters/comp/lang/python/Python-2.5c1/configure	2006-08-28 19:53:19.000000000 -0600
@@ -1709,7 +1709,7 @@
   withval="$with_gcc"
 
 	case $withval in
-	no)	CC=cc
+	no)	CC=$CC
 		without_gcc=yes;;
 	yes)	CC=gcc
 		without_gcc=no;;
@@ -3884,8 +3884,9 @@
 	    BASECFLAGS="$BASECFLAGS -m486 -DSCO5"
 	    ;;
 	# is there any other compiler on Darwin besides gcc?
+	# yes, you fuckwits!
 	Darwin*)
-	    BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
+#	    BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
 	    if test "${enable_universalsdk}"; then
 		BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
 	    fi
@@ -10864,6 +10865,7 @@
             LIBTOOL_CRUFT=""
     fi
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
+	LIBTOOL_CRUFT="${LIBTOOL_CRUFT} $ICC_LIBS"
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
 esac
