From: Michael W. Hudson <mwh@python.net>
Date: Fri, 23 Aug 2002 16:26:17 +0000 (+0000)
Subject: backport loewis' checkin of
X-Git-Tag: v2.2.2b1~198
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72a67ca6fb4245156679cf613d0a75a7d6be4201;p=thirdparty%2FPython%2Fcpython.git

backport loewis' checkin of
    revision 1.309 of configure
    revision 1.319 of configure.in

Use somewhat longer C++ program to detect whether linking requires the C++
compiler. Fixes #559429. 2.2 bugfix candidate.
---

diff --git a/configure b/configure
index 5a07ab6ef314..0be77232b64e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.288.6.5 
+# From configure.in Revision: 1.288.6.6 
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
@@ -1415,7 +1415,7 @@ then
         if test -z "$CXX"; then
               LINKCC="\$(PURIFY) \$(CC)"
         else
-              echo 'int main(){return 0;}' > conftest.$ac_ext
+              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
diff --git a/configure.in b/configure.in
index 48671e2ef0e8..e5fa6dfdd972 100644
--- a/configure.in
+++ b/configure.in
@@ -279,7 +279,7 @@ then
         if test -z "$CXX"; then
               LINKCC="\$(PURIFY) \$(CC)"
         else
-              echo 'int main(){return 0;}' > conftest.$ac_ext
+              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