From 49e77548c826f5648b4518359eaa1d90b02b0495 Mon Sep 17 00:00:00 2001 From: moritz Date: Sun, 15 Mar 2009 13:15:24 +0000 Subject: [PATCH] "pkg-config --libs shout" has produced correct results for a long time now, making a custom shout.m4 obsolete. git-svn-id: https://svn.xiph.org/trunk/ezstream@15774 0101bb08-14d6-0310-b084-bc0e0c8e3800 --- m4/Makefile.am | 2 +- m4/shout.m4 | 88 -------------------------------------------------- 2 files changed, 1 insertion(+), 89 deletions(-) delete mode 100644 m4/shout.m4 diff --git a/m4/Makefile.am b/m4/Makefile.am index 346e713..b747dfd 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1,5 +1,5 @@ AUTOMAKE_OPTIONS = 1.9 foreign -EXTRA_DIST = shout.m4 xiph_compiler.m4 xiph_xml2.m4 +EXTRA_DIST = xiph_compiler.m4 xiph_xml2.m4 CLEANFILES = core *.core *~ .*~ diff --git a/m4/shout.m4 b/m4/shout.m4 deleted file mode 100644 index c4f6120..0000000 --- a/m4/shout.m4 +++ /dev/null @@ -1,88 +0,0 @@ -dnl XIPH_PATH_SHOUT -dnl Jack Moffitt 08-06-2001 -dnl Rewritten for libshout 2 -dnl Brendan Cully 20030612 -dnl -dnl $Id: shout.m4 7180 2004-07-20 02:50:54Z brendan $ - -# XIPH_PATH_SHOUT([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -# Test for libshout, and define SHOUT_CPPFLAGS SHOUT_CFLAGS SHOUT_LIBS, and -# SHOUT_THREADSAFE -AC_DEFUN([XIPH_PATH_SHOUT], -[dnl -xt_have_shout="no" -SHOUT_THREADSAFE="no" -SHOUT_CPPFLAGS="" -SHOUT_CFLAGS="" -SHOUT_LIBS="" - -# NB: PKG_CHECK_MODULES exits if pkg-config is unavailable on the target -# system, so we can't use it. - -# seed pkg-config with the default libshout location -PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/local/lib/pkgconfig} -export PKG_CONFIG_PATH - -# Step 1: Use pkg-config if available -AC_PATH_PROG([PKGCONFIG], [pkg-config], [no]) -if test "$PKGCONFIG" != "no" && `$PKGCONFIG --exists shout` -then - SHOUT_CFLAGS=`$PKGCONFIG --variable=cflags_only shout` - SHOUT_CPPFLAGS=`$PKGCONFIG --variable=cppflags shout` - SHOUT_LIBS=`$PKGCONFIG --libs shout` - xt_have_shout="maybe" -else - if test "$PKGCONFIG" != "no" - then - AC_MSG_NOTICE([$PKGCONFIG couldn't find libshout. Try adjusting PKG_CONFIG_PATH.]) - fi - # pkg-config unavailable, try shout-config - AC_PATH_PROG([SHOUTCONFIG], [shout-config], [no]) - if test "$SHOUTCONFIG" != "no" && test `$SHOUTCONFIG --package` = "libshout" - then - SHOUT_CPPFLAGS=`$SHOUTCONFIG --cppflags` - SHOUT_CFLAGS=`$SHOUTCONFIG --cflags-only` - SHOUT_LIBS=`$SHOUTCONFIG --libs` - xt_have_shout="maybe" - 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, if libshout was built with Speex support. Just -dnl move libm to the end for now. -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 - ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $SHOUT_CPPFLAGS" - CFLAGS="$CFLAGS $SHOUT_CFLAGS" - LIBS="$SHOUT_LIBS $LIBS" - AC_CHECK_HEADERS([shout/shout.h], [ - AC_CHECK_FUNC([shout_new], [ - ifelse([$1], , :, [$1]) - xt_have_shout="yes" - ]) - AC_EGREP_CPP([yes], [#include -#if SHOUT_THREADSAFE -yes -#endif -], [SHOUT_THREADSAFE="yes"]) - ]) - CPPFLAGS="$ac_save_CPPFLAGS" - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" -fi - -if test "$xt_have_shout" != "yes" -then - ifelse([$2], , :, [$2]) -fi -])dnl XIPH_PATH_SHOUT