[Python-checkins] python/dist/src configure, 1.462.2.8, 1.462.2.9 configure.in, 1.475.2.8, 1.475.2.9

loewis@users.sourceforge.net loewis at users.sourceforge.net
Sun Aug 7 23:09:27 CEST 2005


Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24031

Modified Files:
      Tag: release24-maint
	configure configure.in 
Log Message:
Patch #1239112: Correct LINKCC C++ test. Fixes #1189330.


Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.462.2.8
retrieving revision 1.462.2.9
diff -u -d -r1.462.2.8 -r1.462.2.9
--- configure	28 Mar 2005 23:23:02 -0000	1.462.2.8
+++ configure	7 Aug 2005 21:08:42 -0000	1.462.2.9
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.475.2.7 .
+# From configure.in Revision: 1.475.2.8 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.4.
 #
@@ -3265,9 +3265,11 @@
         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 \
+              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: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.475.2.8
retrieving revision 1.475.2.9
diff -u -d -r1.475.2.8 -r1.475.2.9
--- configure.in	28 Mar 2005 23:23:34 -0000	1.475.2.8
+++ configure.in	7 Aug 2005 21:08:53 -0000	1.475.2.9
@@ -471,9 +471,11 @@
         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 \
+              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)"



More information about the Python-checkins mailing list