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

3 files changed, 16 insertions, 7 deletions

diff --git a/configure b/configure
index cad1b579..e5cf2089 100755
--- a/configure
+++ b/configure
@@ -7130,7 +7130,7 @@ $as_echo "[$FFMPEG_VERSION]" >&6; }
 
 # 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)
+	# find FFMpeg's swresample lib (just if FFMpeg is compiled in GPL mode)
 
     have_lib="no"
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libswresample" >&5
@@ -7363,6 +7363,14 @@ $as_echo "[$FFMPEG_VERSION]" >&6; }
     fi
 
 
+else
+
+    if [ xxno = xyes ]; then
+        DEFINE_HAVE_SWRESAMPLE=DEFINE
+    else
+	DEFINE_HAVE_SWRESAMPLE=UNDEF
+    fi
+
 
 fi
 
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
diff --git a/src/config.inc.in b/src/config.inc.in
index 94dc5a2c..62ca5074 100644
--- a/src/config.inc.in
+++ b/src/config.inc.in
@@ -55,7 +55,7 @@
 {$IFEND}
 
 {$@DEFINE_HAVE_SWRESAMPLE@ HaveSWResample}
-{$IF Defined(HaveSWScale) and Defined(IncludeConstants)}
+{$IF Defined(HaveSWResample) and Defined(IncludeConstants)}
   sw__resample = 'libswresample';
   LIBSWRESAMPLE_VERSION_MAJOR   = @libswresample_VERSION_MAJOR@;
   LIBSWRESAMPLE_VERSION_MINOR   = @libswresample_VERSION_MINOR@;