[xiph-commits] r9908 - icecast/trunk/libshout

[brendan at svn.xiph.org]

Author: brendan
Date: 2005-08-31 20:04:59 -0700 (Wed, 31 Aug 2005)
New Revision: 9908

Modified:
   icecast/trunk/libshout/configure.ac
   icecast/trunk/libshout/shout.pc.in
Log:
j at v2v.cc's patch to use pkg-config for vorbis and theora if available

Modified: icecast/trunk/libshout/configure.ac
===================================================================
--- icecast/trunk/libshout/configure.ac	2005-09-01 02:59:21 UTC (rev 9907)
+++ icecast/trunk/libshout/configure.ac	2005-09-01 03:04:59 UTC (rev 9908)
@@ -111,11 +111,23 @@
   AC_DEFINE([NO_THREAD], 1, [Define if you don't want to use the thread library])
 fi
 
-XIPH_PATH_VORBIS(, [AC_MSG_ERROR([requisite Ogg Vorbis library not found])])
+SHOUT_REQUIRES="ogg"
+
+PKG_CHECK_MODULES(VORBIS, vorbis, [
+    HAVE_VORBIS="yes"
+    SHOUT_REQUIRES="$SHOUT_REQUIRES, vorbis"
+  ], [
+    XIPH_PATH_VORBIS(, [AC_MSG_ERROR([requisite Ogg Vorbis library not found])])
+  ])
 VORBIS_LIBS="$VORBIS_LDFLAGS $VORBIS_LIBS"
 XIPH_CFLAGS="$XIPH_CFLAGS $VORBIS_CFLAGS"
 
-XIPH_PATH_THEORA(, [AC_MSG_WARN([Theora library not found, disabling])])
+PKG_CHECK_MODULES(THEORA, theora, [
+    HAVE_THEORA="yes"
+    SHOUT_REQUIRES="$SHOUT_REQUIRES, theora"
+  ], [
+    XIPH_PATH_THEORA(, [AC_MSG_WARN([Theora library not found, disabling])])
+  ])
 XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$THEORA_CFLAGS])
 XIPH_VAR_PREPEND([XIPH_LIBS],[$THEORA LDFLAGS $THEORA_LIBS])
 AM_CONDITIONAL(HAVE_THEORA, test -n "$THEORA_LIBS")
@@ -155,8 +167,10 @@
 
 XIPH_CLEAN_CCFLAGS([$SHOUT_CPPFLAGS], [SHOUT_CPPFLAGS])
 XIPH_CLEAN_CCFLAGS([$SHOUT_CFLAGS], [SHOUT_CFLAGS])
-XIPH_CLEAN_CCFLAGS([$VORBIS_LIBS $PTHREAD_LIBS $LIBS], [SHOUT_LIBDEPS])
+XIPH_CLEAN_CCFLAGS([$VORBIS_LIBS $THEORA_LIBS $PTHREAD_LIBS $LIBS], [SHOUT_LIBDEPS])
+AC_SUBST(PTHREAD_CPPFLAGS)
 AC_SUBST(SHOUT_LIBDEPS)
+AC_SUBST(SHOUT_REQUIRES)
 AC_SUBST(SHOUT_CPPFLAGS)
 AC_SUBST(SHOUT_CFLAGS)
 AC_CONFIG_LIBCONFIG_IN_STATIC

Modified: icecast/trunk/libshout/shout.pc.in
===================================================================
--- icecast/trunk/libshout/shout.pc.in	2005-09-01 02:59:21 UTC (rev 9907)
+++ icecast/trunk/libshout/shout.pc.in	2005-09-01 03:04:59 UTC (rev 9908)
@@ -10,5 +10,6 @@
 Name: Shout
 Description: Audio streaming library for icecast encoders
 Version: @VERSION@
-Libs: -L${libdir} -lshout @SHOUT_LIBDEPS@
-Cflags: @SHOUT_CPPFLAGS@ @SHOUT_CFLAGS@
+Requires: @SHOUT_REQUIRES@
+Libs: -L${libdir} -lshout
+Cflags: -I${includedir} @PTHREAD_CPPFLAGS@ @SHOUT_CFLAGS@