[xiph-cvs] cvs commit: m4 shout.m4

[Brendan]

brendan     03/07/10 21:26:31

  Modified:    .        shout.m4
  Log:
  Update shout.m4 to test for SHOUT_THREADSAFE in shout.h.

Revision  Changes    Path
1.12      +8 -4      m4/shout.m4

Index: shout.m4
===================================================================
RCS file: /usr/local/cvsroot/m4/shout.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -u -r1.11 -r1.12
--- shout.m4	1 Jul 2003 18:02:19 -0000	1.11
+++ shout.m4	11 Jul 2003 01:26:31 -0000	1.12
@@ -3,15 +3,15 @@ dnl Jack Moffitt <jack at icecast.org> 08-0
 dnl Rewritten for libshout 2
 dnl Brendan Cully <brendan at xiph.org> 20030612
 dnl 
-dnl $Id: shout.m4,v 1.11 2003/07/01 18:02:19 brendan Exp $
+dnl $Id: shout.m4,v 1.12 2003/07/11 01:26:31 brendan Exp $
 
 # XIPH_PATH_SHOUT([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 # Test for libshout, and define SHOUT_CPPFLAGS SHOUT_CFLAGS SHOUT_LIBS, and
-# SHOUT_THREADED
+# SHOUT_THREADSAFE
 AC_DEFUN([XIPH_PATH_SHOUT],
 [dnl
 xt_have_shout="no"
-SHOUT_THREADED="no"
+SHOUT_THREADSAFE="no"
 SHOUT_CPPFLAGS=""
 SHOUT_CFLAGS=""
 SHOUT_LIBS=""
@@ -61,7 +61,11 @@ then
       ifelse([$1], , :, [$1])
       xt_have_shout="yes"
     ])
-    AC_CHECK_FUNC([thread_initialize], [SHOUT_THREADED="yes"])
+    AC_EGREP_CPP([yes], [#include <shout/shout.h>
+#if SHOUT_THREADSAFE
+yes
+#endif
+], [SHOUT_THREADSAFE="yes"])
   ])
   CPPFLAGS="$ac_save_CPPFLAGS"
   CFLAGS="$ac_save_CFLAGS"

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.