Remove --enable-avcodec from build scripts, fix FFMPEG detection, do …

…not link to avcodec or include avcodec headers if not detected

build

@@ -19,6 +19,6 @@ echo Compiling our internal SDLnet 1.x
 # now compile ourself
 echo Compiling DOSBox-X
 chmod +x configure
-./configure --enable-core-inline --disable-debug --enable-avcodec --prefix=/usr "$@" || exit 1
+./configure --enable-core-inline --disable-debug --prefix=/usr "$@" || exit 1
 make -j3 || exit 1
 

build-debug

@@ -37,6 +37,6 @@ echo Compiling our internal SDLnet 1.x
 # now compile ourself
 echo Compiling DOSBox-X
 chmod +x configure
-./configure --enable-core-inline --enable-debug=heavy --enable-avcodec --prefix=/usr "$@" $opt || exit 1
+./configure --enable-core-inline --enable-debug=heavy --prefix=/usr "$@" $opt || exit 1
 make -j3 || exit 1
 

build-debug-no-mt32

@@ -26,6 +26,6 @@ echo Compiling our internal SDLnet 1.x
 # now compile ourself
 echo Compiling DOSBox-X
 chmod +x configure
-./configure --enable-core-inline --enable-debug=heavy --enable-avcodec --prefix=/usr --disable-mt32 "$@" || exit 1
+./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --disable-mt32 "$@" || exit 1
 make -j3 || exit 1
 

build-debug-sdl2

@@ -33,6 +33,6 @@ echo Compiling our internal SDLnet 1.x
 (cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1
 
 chmod +x configure
-./configure --enable-core-inline --enable-debug=heavy --enable-avcodec --prefix=/usr --enable-sdl2 "$@" $opt || exit 1
+./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --enable-sdl2 "$@" $opt || exit 1
 make -j3 || exit 1
 

build-macosx

@@ -45,6 +45,6 @@ export CXXFLAGS="$new$CXXFLAGS"
 # now compile ourself
 echo Compiling DOSBox-X
 chmod +x configure
-./configure --enable-core-inline --enable-debug=heavy --prefix=/usr "$@" || exit 1 # --enable-avcodec
+./configure --enable-core-inline --enable-debug=heavy --prefix=/usr "$@" || exit 1
 make -j3 || exit 1
 

build-macosx-sdl2

@@ -42,6 +42,6 @@ export CXXFLAGS="$new$CXXFLAGS"
 # now compile ourself
 echo Compiling DOSBox-X
 chmod +x configure
-./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --enable-sdl2 "$@" || exit 1 # --enable-avcodec
+./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --enable-sdl2 "$@" || exit 1
 make -j3 || exit 1
 

configure.ac

@@ -947,14 +947,12 @@ fi
 dnl FEATURE: FFMPEG output support
 AH_TEMPLATE(C_AVCODEC,[Define to 1 to use FFMPEG libavcodec for video capture])
 AC_ARG_ENABLE(avcodec,AC_HELP_STRING([--disable-avcodec],[Disable FFMPEG avcodec support]),,enable_ffmpeg=yes)
-if test x$enable_avcodec = xyes; then
-	CFLAGS="$CFLAGS "`pkg-config libavcodec --cflags`
-	CPPFLAGS="$CPPFLAGS "`pkg-config libavcodec --cflags`
-	LIBS="$LIBS -lavcodec -lavformat -lavutil -lswscale "`pkg-config libavcodec --libs`
-fi
 if test x$enable_avcodec = xyes; then
     if test x$have_ffmpeg = xyes; then
         if test x$have_avcodec_h = xyes; then
+            CFLAGS="$CFLAGS "`pkg-config libavcodec --cflags`
+            CPPFLAGS="$CPPFLAGS "`pkg-config libavcodec --cflags`
+            LIBS="$LIBS -lavcodec -lavformat -lavutil -lswscale "`pkg-config libavcodec --libs`
             AC_MSG_RESULT(yes)
             AC_DEFINE(C_AVCODEC,1)
         fi