Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.484
diff -u -u -r1.484 configure.in
--- configure.in	28 Mar 2005 23:23:47 -0000	1.484
+++ configure.in	3 May 2005 07:46:03 -0000
@@ -459,8 +459,7 @@
 RUNSHARED=''
 
 # LINKCC is the command that links the python executable -- default is $(CC).
-# If CXX is set, and if it is needed to link a main function that was
-# compiled with CXX, LINKCC is CXX instead. Always using CXX is undesirable:
+# If CXX is set, LINKCC is CXX instead. Always using CXX is undesirable:
 # python might then depend on the C++ runtime
 # This is altered for AIX in order to build the export list before 
 # linking.
@@ -471,16 +470,7 @@
         if test -z "$CXX"; then
               LINKCC="\$(PURIFY) \$(CC)"
         else
-              echo 'void foo();int main(){foo();}void foo(){}' > conftest.$ac_ext
-              $CXX -c conftest.$ac_ext 2>&5
-              if $CC -o conftest$ac_exeext conftest.$ac_objext 2>&5 \
-                 && test -s conftest$ac_exeext && ./conftest$ac_exeext
-              then
-                 LINKCC="\$(PURIFY) \$(CC)"
-              else
-                 LINKCC="\$(PURIFY) \$(CXX)"
-              fi
-              rm -fr conftest*
+              LINKCC="\$(PURIFY) \$(CXX)"
         fi
 	case $ac_sys_system in
 	AIX*)