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: define HAVE_FFMPEG after all checks
bee688e9 · Max Kellermann · d9ce8d83 · bee688e9 · bee688e9
Commit bee688e9 authored Feb 09, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

NEWS NEWS +2 -0

configure.ac configure.ac +5 -2

No files found.
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,8 @@ ver 0.15 - (200?/??/??)


 ver 0.14.2 (2009/??/??)
+* configure.ac:
+  - define HAVE_FFMPEG after all checks
 * decoders:
  - ffmpeg: added support for the tags comment, genre, year
  - ffmpeg: don't warn of empty packet output

--- a/configure.ac
+++ b/configure.ac
@@ -975,8 +975,7 @@ fi
 AM_CONDITIONAL(HAVE_MODPLUG, test x$enable_modplug = 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

@@ -999,6 +998,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)