[Gnash-commit] gnash ChangeLog macros/pthreads.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/18 08:16:06

Modified files:
        .              : ChangeLog 
        macros         : pthreads.m4 

Log message:
        added check for pth-config.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1279&r2=1.1280
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pthreads.m4?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1279
retrieving revision 1.1280
diff -u -b -r1.1279 -r1.1280
--- ChangeLog   18 Oct 2006 07:42:36 -0000      1.1279
+++ ChangeLog   18 Oct 2006 08:16:06 -0000      1.1280
@@ -7,6 +7,7 @@
        * macros/libtool.m4,
          config.guess, config.sub, ltmain.sh: Updated to latest version from 
          2005 / serial 48.
+       * macros/pthreads.m4: added check for pth-config.
 
 2006-10-17 Tomas Groth Christensen <address@hidden>
 

Index: macros/pthreads.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pthreads.m4,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- macros/pthreads.m4  27 Aug 2006 22:24:53 -0000      1.17
+++ macros/pthreads.m4  18 Oct 2006 08:16:06 -0000      1.18
@@ -36,6 +36,7 @@
 dnl 
 
 dnl Copyright © 2006 Steven G. Johnson <address@hidden>.
+dnl $Id: pthreads.m4,v 1.18 2006/10/18 08:16:06 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_PTHREADS],
 [
@@ -77,7 +78,7 @@
 # which indicates that we try without any flags at all, and "pthread-config"
 # which is a program returning the flags for the Pth emulation library.
 
-pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads 
-mthreads pthread --thread-safe -mt pthread-config"
+pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads 
-mthreads pthread --thread-safe -mt pthread-config pth-config"
 
 # The ordering *is* (sometimes) important.  Some notes on the
 # individual items follow:
@@ -97,7 +98,7 @@
 #              ... -mt is also the pthreads flag for HP/aCC
 # pthread:     Linux, etcetera
 # --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
+# pth(read)-config: use pthread-config program (for GNU Pth library)
 
 case "${host_cpu}-${host_os}" in
         *solaris*)
@@ -127,6 +128,13 @@
                 PTHREAD_CFLAGS="$flag"
                 ;;
 
+                pth-config)
+                AC_CHECK_PROG(pth_config, pth-config, yes, no)
+                if test x"$pth_config" = xno; then continue; fi
+                PTHREAD_CFLAGS="`pth-config --cflags`"
+                PTHREAD_LIBS="`pth-config --ldflags` `pth-config --libs`"
+                ;;
+
                 pthread-config)
                 AC_CHECK_PROG(pthread_config, pthread-config, yes, no)
                 if test x"$pthread_config" = xno; then continue; fi