changeset 3868:8a4ef002bb89

opendivx listed at codecs, libvo2/config.mak is optional
author arpi
date Sat, 29 Dec 2001 00:03:47 +0000
parents c8a05d5f68b5
children fb8ff040ff17
files configure
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Fri Dec 28 23:47:16 2001 +0000
+++ b/configure	Sat Dec 29 00:03:47 2001 +0000
@@ -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
@@ -3030,6 +3033,8 @@
 OPTIONAL_OBJS = $_vo2obj
 EOF
 
+fi
+
 #############################################################################
 
 echo "Creating libao2/config.mak"