[Mplayer-cvslog] CVS: main configure,1.342,1.343

[Arpi of Ize]

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

Modified Files:
	configure 
Log Message:
opendivx listed at codecs, libvo2/config.mak is optional

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- configure	28 Dec 2001 23:44:12 -0000	1.342
+++ configure	29 Dec 2001 00:03:47 -0000	1.343
@@ -2360,15 +2360,16 @@
   echores "$_divx4linux_decore"
   test "$_divx4linux_decore" = yes && _divx4linux=yes
 fi
-_def_decore='#undef NEW_DECORE'
-_ld_decore='-Lopendivx -ldecore'
 if test "$_divx4linux_decore" = yes ; then
   _def_decore='#define NEW_DECORE 1'
   _ld_decore='-ldivxdecore opendivx/postprocess.o'
   _codecmodules="divx4linux $_codecmodules"
+else
+  _ld_decore='-Lopendivx -ldecore'
+  _def_decore='#undef NEW_DECORE'
+  _codecmodules="opendivx $_codecmodules"
 fi
 
-
 # mencoder requires those libs: libmp3lame and divx4linux encore
 if test "$_mencoder" != no ; then
   _mencoder=no
@@ -3022,6 +3023,8 @@
 
 #############################################################################
 
+if test -d "libvo2" ; then
+
 echo "Creating libvo2/config.mak"
 _vo2obj=`echo $_vo2src | sed -e 's/\.c/\.o/g'`
 cat > libvo2/config.mak << EOF
@@ -3029,6 +3032,8 @@
 OPTIONAL_SRCS = $_vo2src
 OPTIONAL_OBJS = $_vo2obj
 EOF
+
+fi
 
 #############################################################################