[Mplayer-cvslog] CVS: main configure,1.210,1.211

[Nick Kurshev]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv4315/main

Modified Files:
	configure 
Log Message:
libffmpeg.so support

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- configure	26 Oct 2001 19:54:43 -0000	1.210
+++ configure	27 Oct 2001 13:36:57 -0000	1.211
@@ -571,6 +571,7 @@
 _fastmemcpy=yes
 _streaming=no
 _libavcodec=no
+_libavcodec_so=no
 _kernelextcheck=yes
 
 _x=1
@@ -638,14 +639,18 @@
     _libavcodec=yes
 fi
 
+#Checking for libffmpeg.so
+cat > $TMPC << EOF
+#include <libffmpeg/avcodec.h>
+int main( void ) { return 0; }
+EOF
+cc_check $_extraincdir $_extralibdir -lffmpeg && _libavcodec_so=yes
 
 if test -c /dev/mga_vid ; then
  _mga=yes
  _syncfb=yes
 fi
 
-
-
 case "$host_arch" in
 i386)
     _arch="#define ARCH_X86 1"
@@ -1767,6 +1772,7 @@
 fi
 
 echo "Checking for libavcodec ... $_libavcodec"
+echo "Checking for libffmpeg.so ... $_libavcodec_so"
 echo "Checking for divx4linux ... $_divx4linux"
 echo "Checking for fastmemcpy ... $_fastmemcpy"
 echo "Extra libs : $_extralibdir"
@@ -1907,10 +1913,19 @@
    _lavclib='-Llibavcodec -lavcodec'
    _lavcdep='libavcodec/libavcodec.a'
    _libavcodec='#define USE_LIBAVCODEC'
+   _libavcodecso='#undef USE_LIBAVCODEC'
 else
-   _lavclib=''
-   _lavcdep=''
-   _libavcodec='#undef USE_LIBAVCODEC'
+   if test "$_libavcodec_so" = yes ; then
+      _lavclib='-lffmpeg'
+      _lavcdep=''
+      _libavcodec='#define USE_LIBAVCODEC'
+      _libavcodecso='#define USE_LIBAVCODEC_SO'
+   else
+      _lavclib=''
+      _lavcdep=''
+      _libavcodec='#undef USE_LIBAVCODEC'
+      _libavcodecso='#undef USE_LIBAVCODEC'
+   fi
 fi
 
 if test "$_fastmemcpy" = yes ; then
@@ -2548,6 +2563,7 @@
 
 /* ffmpeg's libavcodec support (requires libavcodec source) */
 $_libavcodec
+$_libavcodecso
 /* use only decoders from libavcodec: */
 #define CONFIG_DECODERS