Commit 45b6f61e authored by David I. Lehn's avatar David I. Lehn

Fix shout2 test.

Original commit message from CVS:
Fix shout2 test.
Upstream removed -lm from libpng, add it back for lib test and flags for now
parent 53fdee38
...@@ -721,7 +721,7 @@ GST_CHECK_FEATURE(SHOUT, [shout plug-in], icecastsend, [ ...@@ -721,7 +721,7 @@ GST_CHECK_FEATURE(SHOUT, [shout plug-in], icecastsend, [
dnl *** shout2 *** dnl *** shout2 ***
translit(dnm, m, l) AM_CONDITIONAL(USE_SHOUT2, true) translit(dnm, m, l) AM_CONDITIONAL(USE_SHOUT2, true)
GST_CHECK_FEATURE(SHOUT2, [shout2 plug-in], shout2send, [ GST_CHECK_FEATURE(SHOUT2, [shout2 plug-in], shout2send, [
AM_PATH_SHOUT2(HAVE_SHOUT2="true", HAVE_SHOUT2="false") AM_PATH_SHOUT2(HAVE_SHOUT2=yes, HAVE_SHOUT2=no)
AC_SUBST(SHOUT2_CFLAGS) AC_SUBST(SHOUT2_CFLAGS)
AC_SUBST(SHOUT2_LIBS) AC_SUBST(SHOUT2_LIBS)
]) ])
...@@ -742,14 +742,14 @@ GST_CHECK_FEATURE(SMOOTHWAVE, [smoothwave plug-in], smoothwave, [ ...@@ -742,14 +742,14 @@ GST_CHECK_FEATURE(SMOOTHWAVE, [smoothwave plug-in], smoothwave, [
dnl *** snapshot *** dnl *** snapshot ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBPNG, true) translit(dnm, m, l) AM_CONDITIONAL(USE_LIBPNG, true)
GST_CHECK_FEATURE(LIBPNG, [snapshot plug-in], snapshot, [ GST_CHECK_FEATURE(LIBPNG, [snapshot plug-in], snapshot, [
GST_CHECK_LIBHEADER(LIBPNG, png, png_read_info, -lz, png.h, LIBPNG_LIBS="-lpng -lz") GST_CHECK_LIBHEADER(LIBPNG, png, png_read_info, -lz -lm, png.h, LIBPNG_LIBS="-lpng -lz -lm")
AC_SUBST(LIBPNG_LIBS) AC_SUBST(LIBPNG_LIBS)
]) ])
dnl *** swfdec *** dnl *** swfdec ***
translit(dnm, m, l) AM_CONDITIONAL(USE_SWFDEC, true) translit(dnm, m, l) AM_CONDITIONAL(USE_SWFDEC, true)
GST_CHECK_FEATURE(SWFDEC, [swfdec plug-in], swfdec, [ GST_CHECK_FEATURE(SWFDEC, [swfdec plug-in], swfdec, [
PKG_CHECK_MODULES(SWFDEC, libswfdec, HAVE_SWFDEC="yes", HAVE_SWFDEC="no") PKG_CHECK_MODULES(SWFDEC, libswfdec, HAVE_SWFDEC=yes, HAVE_SWFDEC=no)
AC_SUBST(SWFDEC_CFLAGS) AC_SUBST(SWFDEC_CFLAGS)
AC_SUBST(SWFDEC_LIBS) AC_SUBST(SWFDEC_LIBS)
]) ])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment