From feec4935253e623bc17f1eab774b7ed3b94126a1 Mon Sep 17 00:00:00 2001 From: brian-ch Date: Sun, 14 Feb 2016 19:01:18 +0000 Subject: Another attempt at fixing the swresample search, should fix the buildbot compilation git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3196 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 346f0488..7a0afe58 100644 --- a/configure.ac +++ b/configure.ac @@ -244,11 +244,12 @@ AC_SUBST_DEFINE(HAVE_SWSCALE, $libswscale_HAVE) # the first swresample header translation was in ffmpeg 2.1 (avutil 52.48.100) if [[ "$libavutil_VERSION_MAJOR" -gt 52 ]] || ([[ "$libavutil_VERSION_MAJOR" -eq 52 ]] && [[ "$libavutil_VERSION_MINOR" -ge 48 ]]); then - # find FFMpeg's swresample lib (just if FFMpeg is compiled in GPL mode) - PKG_HAVE([libswresample], [libswresample], no) - PKG_VERSION([libswresample], [libswresample]) - AC_SUBST_DEFINE(HAVE_SWRESAMPLE, $libswresample_HAVE) - + # find FFMpeg's swresample lib (just if FFMpeg is compiled in GPL mode) + PKG_HAVE([libswresample], [libswresample], no) + PKG_VERSION([libswresample], [libswresample]) + AC_SUBST_DEFINE(HAVE_SWRESAMPLE, $libswresample_HAVE) +else + AC_SUBST_DEFINE(HAVE_SWRESAMPLE, xno) fi # find projectM version -- cgit v1.2.3