From 14b57e5b096a21e625920b612069db533a19bb9d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 9 Feb 2009 22:22:06 +0100 Subject: configure.ac: define HAVE_FFMPEG after all checks Don't define HAVE_FFMPEG if the ffmpeg libraries were found via pkg-config, but ffmpeg support was disabled because avcodec_decode_audio2() is not available. --- configure.ac | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index a68d070ed..cbdd2a618 100644 --- a/configure.ac +++ b/configure.ac @@ -784,8 +784,7 @@ fi AM_CONDITIONAL(HAVE_MIKMOD, test x$enable_mod = xyes) if test x$enable_ffmpeg = xyes; then - PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil], - AC_DEFINE(HAVE_FFMPEG, 1, [Define for FFMPEG support]), + PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil],, enable_ffmpeg=no) fi @@ -808,6 +807,10 @@ if test x$enable_ffmpeg = xyes; then CPPCFLAGS=$old_CPPFLAGS fi +if test x$enable_ffmpeg = xyes; then + AC_DEFINE(HAVE_FFMPEG, 1, [Define for FFMPEG support]), +fi + AM_CONDITIONAL(HAVE_FFMPEG, test x$enable_ffmpeg = xyes) case $with_zeroconf in -- cgit v1.2.3