PR: merge from branch BR_auto_V310 tag mergefrom_OCC_development_for_3_2_0a2_10mar06

[modules/kernel.git] / salome_adm / unix / config_files / enable_pthreads.m4

diff --git a/salome_adm/unix/config_files/enable_pthreads.m4 b/salome_adm/unix/config_files/enable_pthreads.m4
index 45652fbb5c4de4b247b1044a42f7a7befc5823ac..37f878bc67a10fbb2c430172540ead8f4b5bd5ba 100644 (file)
--- a/salome_adm/unix/config_files/enable_pthreads.m4
+++ b/salome_adm/unix/config_files/enable_pthreads.m4
@@ -25,17 +25,22 @@ dnl modify CFLAGS, CXXFLAGS and LIBS for compiling pthread-based programs.
 dnl
 dnl@author  (C) Ruslan Shevchenko <Ruslan@Shevchenko.Kiev.UA>, 1998, 2000
 dnl@id  $Id$
+dnl Modified to use acx_pthread.m4 from GNU Autoconf Macro Archive
 dnl
-dnl
+
 AC_DEFUN([ENABLE_PTHREADS],[
-AC_REQUIRE([CHECK_PTHREADS])
+AC_REQUIRE([ACX_PTHREAD])
 
-if test -z "$enable_pthreads_done"
-then
- CFLAGS="$CFLAGS $CFLAGS_PTHREADS"
- CXXFLAGS="$CXXFLAGS $CXXFLAGS_PTHREADS"
- LIBS="$LIBS $LIBS_PTHREADS"
+if test x"$enable_pthreads_done" != xyes; then
+  if test x"$acx_pthread_ok" = xyes; then
+    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
+    LIBS="$LIBS $PTHREAD_LIBS"
+    threads_ok=yes
+  else
+    threads_ok=no
+  fi
+  enable_pthreads_done=yes
 fi
-enable_pthreads_done=yes
 ])dnl
 dnl