From 0c3e2a0e3f7c617f230418ed3f100443251d7b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Thu, 22 May 2008 16:33:10 +0200
Subject: Add support for Sun Studio compiler even when building on Linux.

--HG--
extra : transplant_source : tu6%0Bb%F5I%A0V%B7%BF%5BM%8E_%86gt%06%1C
---
 m4/pthreads.m4 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'm4')

diff --git a/m4/pthreads.m4 b/m4/pthreads.m4
index ecc580e9a..fb1adaab8 100644
--- a/m4/pthreads.m4
+++ b/m4/pthreads.m4
@@ -20,9 +20,10 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [
      case $host in
        *-hpux11*) PTHREAD_CFLAGS=""		;;
        *-darwin*) PTHREAD_CFLAGS=""		;;
-       *-solaris*)
-                  # Handle Studio compiler
+       *-solaris*|*-linux-gnu)
+                  dnl Handle Sun Studio compiler (also on Linux)
                   CC_CHECK_CFLAGS([-mt], [PTHREAD_CFLAGS="-mt"]);;
+
        *)	  PTHREAD_CFLAGS="-pthread"	;;
      esac
   fi
@@ -31,10 +32,15 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [
        *-hpux11*) PTHREAD_LIBS="-lpthread"	;;
        *-darwin*) PTHREAD_LIBS=""		;;
        *-solaris*)
-                  # Use the same libraries for gcc and sun studio cc
+                  dnl Use the same libraries for gcc and Sun Studio cc
                   PTHREAD_LIBS="-lpthread -lposix4 -lrt";;
        *)	  PTHREAD_LIBS="-pthread"	;;
      esac
+
+     dnl Again, handle Sun Studio compiler
+     if test "x${PTHREAD_CFLAGS}" = "x-mt"; then
+        PTHREAD_LIBS="-mt"
+     fi
   fi
 
   AC_CACHE_CHECK([if $CC supports Pthread],
-- 
cgit v1.2.3