Commit 4f417fe7 authored by Antoine Cellerier's avatar Antoine Cellerier

Fail if avcodec, avformat or swscale couldn't be found (instead of just printing an error).

parent 45e63d59
...@@ -2936,7 +2936,7 @@ then ...@@ -2936,7 +2936,7 @@ then
VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS]) VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS])
VLC_RESTORE_FLAGS VLC_RESTORE_FLAGS
],[ ],[
AC_MSG_ERROR([Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error.]) AC_MSG_FAILURE([Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error.])
]) ])
fi fi
...@@ -2960,7 +2960,7 @@ then ...@@ -2960,7 +2960,7 @@ then
VLC_ADD_CFLAGS([avformat],[$AVFORMAT_CFLAGS]) VLC_ADD_CFLAGS([avformat],[$AVFORMAT_CFLAGS])
VLC_RESTORE_FLAGS VLC_RESTORE_FLAGS
],[ ],[
AC_MSG_ERROR([Could not find libavformat or libavutil. Use --disable-avformat to ignore this error.]) AC_MSG_FAILURE([Could not find libavformat or libavutil. Use --disable-avformat to ignore this error.])
]) ])
fi fi
...@@ -3017,7 +3017,7 @@ then ...@@ -3017,7 +3017,7 @@ then
AC_MSG_WARN([Could not find img_resample in libavcodec.]) AC_MSG_WARN([Could not find img_resample in libavcodec.])
if test "${enable_swscale}" != "no" if test "${enable_swscale}" != "no"
then then
AC_MSG_ERROR([swscale (and its fallback module imgresample) support will be missing. Use --disable-swscale to ignore this error. (This basically means that you will be missing any good software scaling module and some video chroma converters.)]) AC_MSG_FAILURE([swscale (and its fallback module imgresample) support will be missing. Use --disable-swscale to ignore this error. (This basically means that you will be missing any good software scaling module and some video chroma converters.)])
fi fi
# That sed hack to add -rpath is kind of ugly but at least it fixes # That sed hack to add -rpath is kind of ugly but at least it fixes
# detection when linking against a shared libavcodec with # detection when linking against a shared libavcodec with
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment