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

[Brendan]

brendan     03/07/01 14:02:19

  Modified:    .        configure.ac
               .        shout.m4
  Log:
  shout.m4 splits SHOUT_CFLAGS into SHOUT_CFLAGS and SHOUT_CPPFLAGS, and
  defines SHOUT_THREADED if the library was built threadsafe (from Karl).

Revision  Changes    Path
1.10      +2 -2      ices/configure.ac

Index: configure.ac
===================================================================
RCS file: /cvs/ice/ices/configure.ac,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -u -r1.9 -r1.10
--- configure.ac	22 Jun 2003 02:04:24 -0000	1.9
+++ configure.ac	1 Jul 2003 18:02:19 -0000	1.10
@@ -1,5 +1,5 @@
 # configure script for ices
-# $Id: configure.ac,v 1.9 2003/06/22 02:04:24 brendan Exp $
+# $Id: configure.ac,v 1.10 2003/07/01 18:02:19 brendan Exp $
 
 m4_define(ICES_MAJOR, 0)
 m4_define(ICES_MINOR, 2)
@@ -95,7 +95,7 @@ AC_SUBST(moddir)
 dnl -- Required extra libraries --
 
 XIPH_PATH_SHOUT(, [AC_MSG_ERROR([Could not find a usable libshout])])
-CFLAGS="$CFLAGS $SHOUT_CFLAGS"
+CFLAGS="$CFLAGS $SHOUT_CPPFLAGS $SHOUT_CFLAGS"
 LIBS="$LIBS $SHOUT_LIBS"
 
 dnl -- Optional features --

<p><p>1.11      +15 -7     m4/shout.m4

Index: shout.m4
===================================================================
RCS file: /cvs/ice/m4/shout.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -u -r1.10 -r1.11
--- shout.m4	26 Jun 2003 19:38:23 -0000	1.10
+++ shout.m4	1 Jul 2003 18:02:19 -0000	1.11
@@ -3,13 +3,16 @@ 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.10 2003/06/26 19:38:23 brendan Exp $
+dnl $Id: shout.m4,v 1.11 2003/07/01 18:02:19 brendan Exp $
 
 # XIPH_PATH_SHOUT([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-# Test for libshout, and define SHOUT_CFLAGS and SHOUT_LIBS
+# Test for libshout, and define SHOUT_CPPFLAGS SHOUT_CFLAGS SHOUT_LIBS, and
+# SHOUT_THREADED
 AC_DEFUN([XIPH_PATH_SHOUT],
 [dnl
 xt_have_shout="no"
+SHOUT_THREADED="no"
+SHOUT_CPPFLAGS=""
 SHOUT_CFLAGS=""
 SHOUT_LIBS=""
 
@@ -24,7 +27,8 @@ export PKG_CONFIG_PATH
 AC_PATH_PROG([PKGCONFIG], [pkg-config], [no])
 if test "$PKGCONFIG" != "no" && `$PKGCONFIG --exists shout`
 then
-  SHOUT_CFLAGS=`$PKGCONFIG --cflags shout`
+  SHOUT_CFLAGS=`$PKGCONFIG --variable=cflags_only shout`
+  SHOUT_CPPFLAGS=`$PKGCONFIG --variable=cppflags shout`
   SHOUT_LIBS=`$PKGCONFIG --libs shout`
   xt_have_shout="maybe"
 else
@@ -36,7 +40,8 @@ else
   AC_PATH_PROG([SHOUTCONFIG], [shout-config], [no])
   if test "$SHOUTCONFIG" != "no" && test `$SHOUTCONFIG --package` = "libshout"
   then
-    SHOUT_CFLAGS=`$SHOUTCONFIG --cflags`
+    SHOUT_CPPFLAGS=`$SHOUTCONFIG --cppflags`
+    SHOUT_CFLAGS=`$SHOUTCONFIG --cflags-only`
     SHOUT_LIBS=`$SHOUTCONFIG --libs`
     xt_have_shout="maybe"
   fi
@@ -45,17 +50,20 @@ fi
 # Now try actually using libshout
 if test "$xt_have_shout" != "no"
 then
+  ac_save_CPPFLAGS="$CPPFLAGS"
   ac_save_CFLAGS="$CFLAGS"
   ac_save_LIBS="$LIBS"
+  CPPFLAGS="$CPPFLAGS $SHOUT_CPPFLAGS"
   CFLAGS="$CFLAGS $SHOUT_CFLAGS"
-  LIBS="$LIBS $SHOUT_LIBS"
-  AC_CHECK_HEADER([shout/shout.h], [
-    AC_DEFINE([HAVE_SHOUT_SHOUT_H], 1, [Define if you have <shout/shout.h>])
+  LIBS="$SHOUT_LIBS $LIBS"
+  AC_CHECK_HEADERS([shout/shout.h], [
     AC_CHECK_FUNC([shout_new], [
       ifelse([$1], , :, [$1])
       xt_have_shout="yes"
     ])
+    AC_CHECK_FUNC([thread_initialize], [SHOUT_THREADED="yes"])
   ])
+  CPPFLAGS="$ac_save_CPPFLAGS"
   CFLAGS="$ac_save_CFLAGS"
   LIBS="$ac_save_LIBS"
 fi

<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.