Fix enabling/disabling of FFMPEG based on --without-ffmpeg / AC_AGI_COMPILE.
Originally committed to SVN as r2708.
This commit is contained in:
parent
1a398b79a0
commit
79ee6c4337
1 changed files with 2 additions and 2 deletions
|
@ -578,12 +578,12 @@ int main (void) {
|
||||||
} ])
|
} ])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$agi_cv_with_ffmpeg" = "no" && test "$with_ffmpeg" = "yes"; then
|
if test "$agi_cv_with_ffmpeg" = "no" && test "$with_ffmpeg" != "no"; then
|
||||||
AC_MSG_WARN([FFMPEG detected, but it doesn't work...])
|
AC_MSG_WARN([FFMPEG detected, but it doesn't work...])
|
||||||
with_ffmpeg="no"
|
with_ffmpeg="no"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$agi_cv_with_ffmpeg" = "yes" && test "$with_ffmpeg" = "yes"; then
|
if test "$agi_cv_with_ffmpeg" = "yes" && test "$with_ffmpeg" != "no"; then
|
||||||
AC_SUBST(LIBAVFORMAT_LIBS)
|
AC_SUBST(LIBAVFORMAT_LIBS)
|
||||||
AC_SUBST(LIBAVFORMAT_CFLAGS)
|
AC_SUBST(LIBAVFORMAT_CFLAGS)
|
||||||
AC_SUBST(LIBAVCODEC_LIBS)
|
AC_SUBST(LIBAVCODEC_LIBS)
|
||||||
|
|
Loading…
Reference in a new issue