Import changes from CUPS 1.4svn-r8704.

[thirdparty/cups.git] / config-scripts / cups-threads.m4

diff --git a/config-scripts/cups-threads.m4 b/config-scripts/cups-threads.m4
index 47f76e2aedcb316c8a73ecf612962d14b56c48c8..aa07c8950068b58c9dd0b2aebc2ebfe6dfb26b12 100644 (file)
--- a/config-scripts/cups-threads.m4
+++ b/config-scripts/cups-threads.m4
@@ -1,28 +1,19 @@
 dnl
-dnl "$Id: cups-threads.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id: cups-threads.m4 6649 2007-07-11 21:46:42Z mike $"
 dnl
 dnl   Threading stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007-2009 by Apple Inc.
 dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
-AC_ARG_ENABLE(threads, [  --enable-threads        enable multi-threading support])
+AC_ARG_ENABLE(threads, [  --disable-threads       disable multi-threading support])
 
 have_pthread=no
 PTHREAD_FLAGS=""
@@ -44,6 +35,12 @@ if test "x$enable_threads" != xno; then
 
                        if test $have_pthread = yes; then
                                PTHREAD_FLAGS="-D_THREAD_SAFE -D_REENTRANT"
+
+                               # Solaris requires -D_POSIX_PTHREAD_SEMANTICS to
+                               # be POSIX-compliant... :(
+                               if test $uname = SunOS; then
+                                       PTHREAD_FLAGS="$PTHREAD_FLAGS -D_POSIX_PTHREAD_SEMANTICS"
+                               fi
                                break
                        fi
                done
@@ -53,5 +50,5 @@ fi
 AC_SUBST(PTHREAD_FLAGS)
 
 dnl
-dnl End of "$Id: cups-threads.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id: cups-threads.m4 6649 2007-07-11 21:46:42Z mike $".
 dnl