[gs-cvs] rev 8705 - branches/mtrender/src

[ray at ghostscript.com]

Author: ray
Date: 2008-05-05 13:39:02 -0700 (Mon, 05 May 2008)
New Revision: 8705

Modified:
   branches/mtrender/src/Makefile.in
   branches/mtrender/src/configure.ac
Log:
Add changes from rev 8656 that were inadvertently zapped when merging in
changes to HEAD. These are needed to include 'posync' and 'lpthread' if
available so that multi-threaded rendering works.


Modified: branches/mtrender/src/Makefile.in
===================================================================
--- branches/mtrender/src/Makefile.in	2008-05-05 19:51:17 UTC (rev 8704)
+++ branches/mtrender/src/Makefile.in	2008-05-05 20:39:02 UTC (rev 8705)
@@ -304,11 +304,8 @@
 # All reasonable platforms require -lm, but Rhapsody and perhaps one or
 # two others fold libm into libc and don't require any additional library.
 
-#STDLIBS=-lpthread -lm
+STDLIBS=@PTHREAD_LIBS@ -lm
 
-# Since the default build is for nosync, don't include pthread lib
-STDLIBS=-lm
-
 # Define the include switch(es) for the X11 header files.
 # This can be null if handled in some other way (e.g., the files are
 # in /usr/include, or the directory is supplied by an environment variable)
@@ -339,12 +336,11 @@
 # primitives for this platform.
 
 # If POSIX sync primitives are used, also change the STDLIBS to include
-# the pthread library.
+# the pthread library. Otherwise use SYNC=nosync
 #SYNC=posync
+#SYNC=nosync
+SYNC=@SYNC@
 
-# Default is No sync primitives since some platforms don't have it (HP-UX)
-SYNC=nosync
-
 # programs we use
 RM=rm -f
 

Modified: branches/mtrender/src/configure.ac
===================================================================
--- branches/mtrender/src/configure.ac	2008-05-05 19:51:17 UTC (rev 8704)
+++ branches/mtrender/src/configure.ac	2008-05-05 20:39:02 UTC (rev 8705)
@@ -247,8 +247,16 @@
 dnl --------------------------------------------------
 
 AC_CHECK_LIB(m, cos)
-dnl AC_CHECK_LIB(pthread, pthread_create)
 
+SYNC="nosync"
+PTHREAD_LIBS=""
+AC_CHECK_LIB(pthread, pthread_create, [
+  SYNC=posync;
+  PTHREAD_LIBS="-lpthread"
+])
+AC_SUBST(SYNC)
+AC_SUBST(PTHREAD_LIBS)
+
 dnl Tests for iconv (Needed for OpenPrinting Vector, "opvp" output device)
 AC_ARG_WITH(libiconv,
             [AC_HELP_STRING([--with-libiconv=@<:@no/gnu/native@:>@],