Patch #758910: Add pthread flag to CXX if possible.

2 files changed, 85 insertions, 1 deletions

diff --git a/configure b/configure
index 810e718..ef183c7 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.417 .
+# From configure.in Revision: 1.418 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53 for python 2.3.
 #
@@ -4018,6 +4018,49 @@ echo "$as_me:$LINENO: result: $ac_cv_pthread" >&5
 echo "${ECHO_T}$ac_cv_pthread" >&6
 fi
 
+# If we have set a CC compiler flag for thread support then
+# check if it works for CXX, too.
+ac_cv_cxx_thread=no
+if test ! -z "$CXX"
+then
+echo "$as_me:$LINENO: checking whether $CXX also accepts flags for thread support" >&5
+echo $ECHO_N "checking whether $CXX also accepts flags for thread support... $ECHO_C" >&6
+ac_save_cxx="$CXX"
+
+if test "$ac_cv_kpthread" = "yes"
+then
+  CXX="$CXX -Kpthread"
+  ac_cv_cxx_thread=yes
+elif test "$ac_cv_kthread" = "yes"
+then
+  CXX="$CXX -Kthread"
+  ac_cv_cxx_thread=yes
+elif test "$ac_cv_pthread" = "yes"
+then
+  CXX="$CXX -pthread"
+  ac_cv_cxx_thread=yes
+fi
+
+if test $ac_cv_cxx_thread = yes
+then
+  echo 'void foo();int main(){foo();}void foo(){}' > conftest.$ac_ext
+  $CXX -c conftest.$ac_ext 2>&5
+  if $CXX -o conftest$ac_exeext conftest.$ac_objext 2>&5 \
+     && test -s conftest$ac_exeext && ./conftest$ac_exeext
+  then
+    ac_cv_cxx_thread=yes
+  else
+    ac_cv_cxx_thread=no
+    CXX="$ac_save_cxx"
+  fi
+  rm -fr conftest*
+else
+ CXX="$ac_save_cxx"
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_cxx_thread" >&5
+echo "${ECHO_T}$ac_cv_cxx_thread" >&6
+
 
 # checks for header files
 echo "$as_me:$LINENO: checking for ANSI C header files" >&5
diff --git a/configure.in b/configure.in
index fb1c962..bfe1e38 100644
--- a/configure.in
+++ b/configure.in
@@ -832,6 +832,47 @@ CC="$ac_save_cc"])
 AC_MSG_RESULT($ac_cv_pthread)
 fi
 
+# If we have set a CC compiler flag for thread support then
+# check if it works for CXX, too.
+ac_cv_cxx_thread=no
+if test ! -z "$CXX"
+then
+AC_MSG_CHECKING(whether $CXX also accepts flags for thread support)
+ac_save_cxx="$CXX"
+
+if test "$ac_cv_kpthread" = "yes"
+then
+  CXX="$CXX -Kpthread"
+  ac_cv_cxx_thread=yes
+elif test "$ac_cv_kthread" = "yes"
+then
+  CXX="$CXX -Kthread"
+  ac_cv_cxx_thread=yes
+elif test "$ac_cv_pthread" = "yes"
+then 
+  CXX="$CXX -pthread"
+  ac_cv_cxx_thread=yes
+fi
+
+if test $ac_cv_cxx_thread = yes
+then
+  echo 'void foo();int main(){foo();}void foo(){}' > conftest.$ac_ext
+  $CXX -c conftest.$ac_ext 2>&5
+  if $CXX -o conftest$ac_exeext conftest.$ac_objext 2>&5 \
+     && test -s conftest$ac_exeext && ./conftest$ac_exeext
+  then
+    ac_cv_cxx_thread=yes
+  else
+    ac_cv_cxx_thread=no
+    CXX="$ac_save_cxx"
+  fi
+  rm -fr conftest*
+else
+ CXX="$ac_save_cxx"
+fi
+fi
+AC_MSG_RESULT($ac_cv_cxx_thread)
+
 dnl # check for ANSI or K&R ("traditional") preprocessor
 dnl AC_MSG_CHECKING(for C preprocessor type)
 dnl AC_TRY_COMPILE([