diff -u -r Python-2.4.1.orig/Makefile.pre.in Python-2.4.1/Makefile.pre.in
--- Python-2.4.1.orig/Makefile.pre.in	2005-03-29 01:23:01.000000000 +0200
+++ Python-2.4.1/Makefile.pre.in	2005-06-08 04:38:02.000000000 +0200
@@ -309,7 +309,7 @@
 
 # Build the interpreter
 $(BUILDPYTHON):	Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY)
-		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
+		$(CXX) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
 			Modules/$(MAINOBJ) \
 			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
 
diff -u -r Python-2.4.1.orig/configure.in Python-2.4.1/configure.in
--- Python-2.4.1.orig/configure.in	2005-03-29 01:23:34.000000000 +0200
+++ Python-2.4.1/configure.in	2005-06-08 04:09:44.000000000 +0200
@@ -2849,7 +2849,7 @@
 # check for readline 2.1
 AC_CHECK_LIB(readline, rl_callback_handler_install,
 	AC_DEFINE(HAVE_RL_CALLBACK, 1,
-        [Define if you have readline 2.1]), , -ltermcap)
+        [Define if you have readline 2.1]), , -lncurses)
 
 # check for readline 2.2
 AC_TRY_CPP([#include <readline/readline.h>],
@@ -2865,12 +2865,12 @@
 # check for readline 4.0
 AC_CHECK_LIB(readline, rl_pre_input_hook,
 	AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK, 1,
-        [Define if you have readline 4.0]), , -ltermcap)
+        [Define if you have readline 4.0]), , -lncurses)
 
 # check for readline 4.2
 AC_CHECK_LIB(readline, rl_completion_matches,
 	AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1,
-        [Define if you have readline 4.2]), , -ltermcap)
+        [Define if you have readline 4.2]), , -lncurses)
 
 # also in readline 4.2
 AC_TRY_CPP([#include <readline/readline.h>],