diff options
| author | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2016-02-14 19:01:18 +0000 |
|---|---|---|
| committer | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2016-02-14 19:01:18 +0000 |
| commit | feec4935253e623bc17f1eab774b7ed3b94126a1 (patch) | |
| tree | c9b5355da9475c1c59241cadf8bfbceea2eb98f4 /configure.ac | |
| parent | 64fdc1d7a04550ee9d004081b0eceb424ba23d06 (diff) | |
| download | usdx-github/svn/trunk.tar.gz usdx-github/svn/trunk.tar.xz usdx-github/svn/trunk.zip | |
Another attempt at fixing the swresample search, should fix the buildbot compilationHEADsvn/trunkmastergithub/svn/trunk
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3196 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 6 insertions, 5 deletions
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 |