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 5a07ab6ef314c8722d9386782bb524a47a5de4c8..0be77232b64e46d08a04e20faa5cded78e59eb71 100755 (executable)
--- 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 48671e2ef0e8cc3b89c86f3e6a0fb06f9347dedc..e5fa6dfdd97283f3cea34b15ccb5445501c3da2a 100644 (file)
--- 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