Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.475.2.8
diff -c -r1.475.2.8 configure.in
*** configure.in	28 Mar 2005 23:23:34 -0000	1.475.2.8
--- configure.in	15 Jul 2005 18:22:39 -0000
***************
*** 471,479 ****
          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)"
--- 471,481 ----
          if test -z "$CXX"; then
                LINKCC="\$(PURIFY) \$(CC)"
          else
!               echo 'extern "C" void foo();int main(){foo();}' > conftest_a.cc
!               $CXX -c conftest_a.cc # 2>&5
!               echo 'void foo(){}' > conftest_b.$ac_ext
!               $CC -c conftest_b.$ac_ext # 2>&5
!               if $CC -o conftest$ac_exeext conftest_a.$ac_objext conftest_b.$ac_objext 2>&5 \
                   && test -s conftest$ac_exeext && ./conftest$ac_exeext
                then
                   LINKCC="\$(PURIFY) \$(CC)"
Index: Misc/NEWS
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v
retrieving revision 1.1193.2.61
diff -c -r1.1193.2.61 NEWS
*** Misc/NEWS	11 Jul 2005 05:57:10 -0000	1.1193.2.61
--- Misc/NEWS	15 Jul 2005 18:22:45 -0000
***************
*** 35,40 ****
--- 35,46 ----
  - Bug #1165306: instancemethod_new allowed the creation of a method
    with im_class == im_self == NULL, which caused a crash when called.
  
+ Build
+ -----
+ 
+ - Bug #1189330: configure did not correctly determine the necessary value of
+   LINKCC if python was built with GCC 4.0.
+ 
  Extension Modules
  -----------------