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 aca04101775877e35238f1167dff11998b202493..28a58348aa92c3f503b67b1805d0e0706a669abb 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.317 .
+# From configure.in Revision: 1.318 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53.
 #
@@ -3037,7 +3037,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 37c6f636c46dafe0f642c730f9b90a2d108f74c9..1003761a1520912787df0b4bb7e10de15cd02ae1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -309,7 +309,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