Attachment 9213 Details for Bug 10333 – Enable/disable mad/ffmpeg via configure

[patch] Enable/disable mad/ffmpeg via configure

swfdec-configure.patch (text/plain), 1.99 KB, created by Mikel Olasagasti on 2007-03-18 11:15:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikel Olasagasti

Created: 2007-03-18 11:15:39 UTC

Size: 1.99 KB

patch

obsolete

>--- swfdec/configure.ac	2007-03-15 21:01:06.000000000 +0100
>+++ swfdec-new/configure.ac	2007-03-18 20:05:25.000000000 +0100
>@@ -135,10 +135,22 @@
>   AC_MSG_ERROR([cannot find cairo, which is required for build])
> fi
> 
>-AC_CHECK_LIB(mad, mad_decoder_finish, HAVE_MAD="yes" MAD_LIBS="-lmad", HAVE_MAD="no")
>-AC_SUBST(MAD_LIBS)
>-if test "x$HAVE_MAD" = xyes; then
>-  AC_DEFINE(HAVE_MAD, 1, [Define if mad is enabled])
>+AC_ARG_ENABLE(mad,
>+	AS_HELP_STRING([--enable-mad],
>+			[enable mad audio (default=yes)])],
>+	enable_mad=$enableval,
>+	enable_mad="yes")
>+
>+if test "$enable_mad" = "yes"; then
>+	AC_CHECK_LIB(mad, mad_decoder_finish, HAVE_MAD="yes" MAD_LIBS="-lmad", HAVE_MAD="no")
>+	AC_SUBST(MAD_LIBS)
>+	if test "x$HAVE_MAD" = xyes; then
>+	  AC_DEFINE(HAVE_MAD, 1, [Define if mad is enabled])
>+	else
>+	  AC_MSG_ERROR([Couldn't find mad.])
>+	fi
>+else
>+	AC_MSG_WARN([*** mad audio support was not enabled. ***])
> fi
> AM_CONDITIONAL(HAVE_MAD, [test "x$HAVE_MAD" = xyes])
> 
>@@ -146,11 +158,23 @@
> dnl  to detect ffmpeg. But as it stands even pkg-config versions are weird.
> dnl  So you'll have to update your ffmpeg checkout if compilation fails.
> dnl  Or you submit a patch that detects ffmpeg reliably on the distros.
>-PKG_CHECK_MODULES(FFMPEG, libavcodec, HAVE_FFMPEG=yes, HAVE_FFMPEG=no)
>-AC_SUBST(FFMPEG_CFLAGS)
>-AC_SUBST(FFMPEG_LIBS)
>-if test "x$HAVE_FFMPEG" = xyes; then
>-  AC_DEFINE(HAVE_FFMPEG, 1, [Define if ffmpeg is enabled])
>+AC_ARG_ENABLE(ffmpeg,
>+	AS_HELP_STRING([--enable-ffmpeg],
>+			[enable ffmpeg support (default=yes)])],
>+	enable_ffmpeg=$enableval,
>+	enable_ffmpeg="yes")
>+
>+if test "$enable_ffmpeg" = "yes"; then
>+	PKG_CHECK_MODULES(FFMPEG, libavcodec, HAVE_FFMPEG=yes, HAVE_FFMPEG=no)
>+	AC_SUBST(FFMPEG_CFLAGS)
>+	AC_SUBST(FFMPEG_LIBS)
>+	if test "x$HAVE_FFMPEG" = xyes; then
>+	  AC_DEFINE(HAVE_FFMPEG, 1, [Define if ffmpeg is enabled])
>+	else
>+	  AC_MSG_ERROR([Couldn't find ffmpeg.])
>+	fi
>+else
>+	AC_MSG_WARN([*** ffmpeg support was not enabled. ***])
> fi
> AM_CONDITIONAL(HAVE_FFMPEG, [test "x$HAVE_FFMPEG" = xyes])
>

Actions: View | Splinter Review

Attachments on bug 10333: 9213

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.