[xiph-commits] r12572 - in trunk/ezstream: . m4

[moritz at svn.xiph.org]

Author: moritz
Date: 2007-02-26 12:29:48 -0800 (Mon, 26 Feb 2007)
New Revision: 12572

Modified:
   trunk/ezstream/configure.in
   trunk/ezstream/m4/shout.m4
Log:
Make this work on static archs, and get one step closer to SunCC support on
Solaris. Also, don't complain if libshout isn't thread-safe, as Ezstream isn't
multithreaded.


Modified: trunk/ezstream/configure.in
===================================================================
--- trunk/ezstream/configure.in	2007-02-26 19:59:19 UTC (rev 12571)
+++ trunk/ezstream/configure.in	2007-02-26 20:29:48 UTC (rev 12572)
@@ -73,25 +73,30 @@
 
 dnl CONFIGURE OPTIONS
 
-XIPH_PATH_SHOUT(, AC_MSG_ERROR([must have libshout installed!]))
-if test "$SHOUT_THREADSAFE" != "yes"; then
-	AC_MSG_ERROR([This libshout isn't threadsafe])
-fi 
+dnl Check for Ogg Vorbis
+XIPH_PATH_OGG(, AC_MSG_ERROR([Must have libogg 1.x installed.]))
+XIPH_PATH_VORBIS(, AC_MSG_ERROR([Must have libvorbis 1.x installed.]))
 
-XIPH_PATH_XML
+dnl Check for libshout.
+XIPH_PATH_SHOUT(, AC_MSG_ERROR([Must have libshout 2.x installed.]))
 
-XIPH_VAR_APPEND([XIPH_CFLAGS], [$XML_CFLAGS])
-XIPH_VAR_PREPEND([XIPH_LIBS], [$XML_LIBS])
+dnl Check for libxml
+XIPH_PATH_XML(, AC_MSG_ERROR([Must have libxml 2.x installed.]))
 
+dnl Assemble *FLAGS and *LIBS in the proper order.
+XIPH_VAR_APPEND([XIPH_CFLAGS], [$OGG_CFLAGS])
+XIPH_VAR_PREPEND([XIPH_LIBS], [$OGG_LIBS])
+XIPH_VAR_APPEND([XIPH_CFLAGS], [$VORBIS_CFLAGS])
+XIPH_VAR_PREPEND([XIPH_LIBS], [$VORBIS_LIBS])
+XIPH_VAR_APPEND([XIPH_CFLAGS], [$VORBISFILE_CFLAGS])
+XIPH_VAR_PREPEND([XIPH_LIBS], [$VORBISFILE_LIBS])
+XIPH_VAR_APPEND([XIPH_CFLAGS], [$SHOUT_CFLAGS])
 XIPH_VAR_APPEND([XIPH_CPPFLAGS], [$SHOUT_CPPFLAGS])
-XIPH_VAR_APPEND([XIPH_CFLAGS], [$SHOUT_CFLAGS])
 XIPH_VAR_PREPEND([XIPH_LIBS], [$SHOUT_LIBS])
+XIPH_VAR_APPEND([XIPH_CFLAGS], [$XML_CFLAGS])
+XIPH_VAR_PREPEND([XIPH_LIBS], [$XML_LIBS])
 
-XIPH_PATH_VORBIS(, AC_MSG_ERROR([must have Ogg Vorbis v1.0 installed!]))
-XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$VORBIS_CFLAGS $VORBISFILE_CFLAGS])
-XIPH_VAR_PREPEND([XIPH_LIBS],[$VORBIS_LIBS $VORBISFILE_LIBS])
 
-
 dnl OUTPUT
 
 AC_CONFIG_FILES(Makefile \

Modified: trunk/ezstream/m4/shout.m4
===================================================================
--- trunk/ezstream/m4/shout.m4	2007-02-26 19:59:19 UTC (rev 12571)
+++ trunk/ezstream/m4/shout.m4	2007-02-26 20:29:48 UTC (rev 12572)
@@ -47,6 +47,14 @@
   fi
 fi
 
+dnl XXX - Up until and including speex-1.2beta1, '-lm' has been missing from
+dnl       --libs in speex.pc, even though Speex (still) depends on it. This is
+dnl       a problem for Solaris' linker and at least some static archs using
+dnl       GNU ld. '-lm' now comes from the libshout's libvorbis dependency and
+dnl       is in the wrong place.
+xt_shout_TEMP="`echo $SHOUT_LIBS | sed -e 's,-lm,,g'`"
+SHOUT_LIBS="$xt_shout_TEMP -lm"
+
 # Now try actually using libshout
 if test "$xt_have_shout" != "no"
 then