]> git.sesse.net Git - vlc/commitdiff
* ./configure.in: tried to fix the -lavcodec detection.
authorSam Hocevar <sam@videolan.org>
Mon, 20 May 2002 22:26:01 +0000 (22:26 +0000)
committerSam Hocevar <sam@videolan.org>
Mon, 20 May 2002 22:26:01 +0000 (22:26 +0000)
configure
configure.in

index af98f3160bc0bd04560817ef3082ae69a906e607..91067f1fbf13a01ad66a31085c57b15b56ca9978 100755 (executable)
--- a/configure
+++ b/configure
@@ -6513,7 +6513,7 @@ echo "configure:6506: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5
     then
             echo "$ac_t""${real_ffmpeg_tree}/libavcodec/libavcodec.a" 1>&6
       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"
     else
             echo "$ac_t""no" 1>&6
@@ -6523,7 +6523,7 @@ echo "configure:6506: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5
     save_CFLAGS=$CFLAGS
     save_LDFLAGS=$LDFLAGS
     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 "configure:6529: checking for avcodec_init in -lavcodec" >&5
 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
   echo "$ac_t""yes" 1>&6
   
       BUILTINS="${BUILTINS} ffmpeg"
-      ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec" 
+      ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec -lm
 else
   echo "$ac_t""no" 1>&6
  { echo "configure: error: Cannot find libavcodec library..." 1>&2; exit 1; } 
index 7e4253b4c261d6e6d5fb41ec7a9a54b0e91f74de..e3a96c24604bf3cc54c3b604d455b3c1eb33c8c7 100644 (file)
@@ -902,7 +902,7 @@ then
       dnl  Use a custom libffmpeg
       AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
       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"
     else
       dnl  The given libavcodec wasn't built
@@ -913,10 +913,10 @@ then
     save_CFLAGS=$CFLAGS
     save_LDFLAGS=$LDFLAGS
     CFLAGS="$CFLAGS $ffmpeg_CFLAGS"
-    LDFLAGS="$LDFLAGS $ffmpeg_LDFLAGS"
+    LDFLAGS="$LDFLAGS $ffmpeg_LDFLAGS -lm"
     AC_CHECK_LIB(avcodec, avcodec_init, [
       BUILTINS="${BUILTINS} ffmpeg"
-      ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec" ],
+      ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec -lm" ],
       [ AC_MSG_ERROR([Cannot find libavcodec library...]) ])
     CFLAGS=$save_CFLAGS
     LDFLAGS=$save_LDFLAGS