Skip to content

V
vlc
Commit 50e52624 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* ./configure.in: tried to fix the -lavcodec detection.

parent ff4bf779
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
configure
View file @ 50e52624
...@@ -6513,7 +6513,7 @@ echo "configure:6506: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5 ...@@ -6513,7 +6513,7 @@ echo "configure:6506: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5
then then
echo "$ac_t""${real_ffmpeg_tree}/libavcodec/libavcodec.a" 1>&6 echo "$ac_t""${real_ffmpeg_tree}/libavcodec/libavcodec.a" 1>&6
BUILTINS="${BUILTINS} ffmpeg" BUILTINS="${BUILTINS} ffmpeg"
ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a" ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a -lm"
ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I${real_ffmpeg_tree}/libavcodec" ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I${real_ffmpeg_tree}/libavcodec"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
...@@ -6523,7 +6523,7 @@ echo "configure:6506: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5 ...@@ -6523,7 +6523,7 @@ echo "configure:6506: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5
save_CFLAGS=$CFLAGS save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS save_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS $ffmpeg_CFLAGS" CFLAGS="$CFLAGS $ffmpeg_CFLAGS"
LDFLAGS="$LDFLAGS $ffmpeg_LDFLAGS" LDFLAGS="$LDFLAGS $ffmpeg_LDFLAGS -lm"
echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6 echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
echo "configure:6529: checking for avcodec_init in -lavcodec" >&5 echo "configure:6529: checking for avcodec_init in -lavcodec" >&5
ac_lib_var=`echo avcodec'_'avcodec_init | sed 'y%./+-%__p_%'` ac_lib_var=`echo avcodec'_'avcodec_init | sed 'y%./+-%__p_%'`
...@@ -6561,7 +6561,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ...@@ -6561,7 +6561,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
BUILTINS="${BUILTINS} ffmpeg" BUILTINS="${BUILTINS} ffmpeg"
ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec" ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec -lm"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
{ echo "configure: error: Cannot find libavcodec library..." 1>&2; exit 1; } { echo "configure: error: Cannot find libavcodec library..." 1>&2; exit 1; }
......
configure.in
View file @ 50e52624
...@@ -902,7 +902,7 @@ then ...@@ -902,7 +902,7 @@ then
dnl Use a custom libffmpeg dnl Use a custom libffmpeg
AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a) AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
BUILTINS="${BUILTINS} ffmpeg" BUILTINS="${BUILTINS} ffmpeg"
ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a" ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a -lm"
ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I${real_ffmpeg_tree}/libavcodec" ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I${real_ffmpeg_tree}/libavcodec"
else else
dnl The given libavcodec wasn't built dnl The given libavcodec wasn't built
...@@ -913,10 +913,10 @@ then ...@@ -913,10 +913,10 @@ then
save_CFLAGS=$CFLAGS save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS save_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS $ffmpeg_CFLAGS" CFLAGS="$CFLAGS $ffmpeg_CFLAGS"
LDFLAGS="$LDFLAGS $ffmpeg_LDFLAGS" LDFLAGS="$LDFLAGS $ffmpeg_LDFLAGS -lm"
AC_CHECK_LIB(avcodec, avcodec_init, [ AC_CHECK_LIB(avcodec, avcodec_init, [
BUILTINS="${BUILTINS} ffmpeg" BUILTINS="${BUILTINS} ffmpeg"
ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec" ], ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec -lm" ],
[ AC_MSG_ERROR([Cannot find libavcodec library...]) ]) [ AC_MSG_ERROR([Cannot find libavcodec library...]) ])
CFLAGS=$save_CFLAGS CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS LDFLAGS=$save_LDFLAGS
......
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