Commit ba01d80a authored by Rafaël Carré's avatar Rafaël Carré

Fix configuration

VLC_SAVE_FLAGS is intended to be used only once : before any modification of the flags
Do not use $LIBS after it has been overwritten by FFmpeg checks
(cherry picked from commit 18c6e88e0aff698dc8647c244b509bf786d14c59)
parent 86132d3d
...@@ -2705,7 +2705,6 @@ dnl Look for a ffmpeg-config (we are on debian ) ...@@ -2705,7 +2705,6 @@ dnl Look for a ffmpeg-config (we are on debian )
dnl Trying with pkg-config dnl Trying with pkg-config
PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat], PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat],
[ [
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS}" CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS}"
CFLAGS="${CFLAGS} ${FFMPEG_CFLAGS}" CFLAGS="${CFLAGS} ${FFMPEG_CFLAGS}"
AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h) AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h)
...@@ -2773,7 +2772,6 @@ fi ...@@ -2773,7 +2772,6 @@ fi
dnl Check if we have (required) img_resample() in libavcodec dnl Check if we have (required) img_resample() in libavcodec
if test "${enable_ffmpeg}" != "no" if test "${enable_ffmpeg}" != "no"
then then
VLC_SAVE_FLAGS
CFLAGS="${CFLAGS} ${CFLAGS_ffmpeg}" CFLAGS="${CFLAGS} ${CFLAGS_ffmpeg}"
LDFLAGS="${LDFLAGS} ${LDFLAGS_ffmpeg}" LDFLAGS="${LDFLAGS} ${LDFLAGS_ffmpeg}"
AC_CHECK_LIB(avcodec, img_resample, , AC_CHECK_LIB(avcodec, img_resample, ,
...@@ -2781,6 +2779,9 @@ then ...@@ -2781,6 +2779,9 @@ then
VLC_RESTORE_FLAGS VLC_RESTORE_FLAGS
fi fi
dnl Clean out environment
LIBS="${LIBS_save}"
dnl dnl
dnl ffmpegaltivec plugin dnl ffmpegaltivec plugin
dnl dnl
......
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