[Mplayer-cvslog] CVS: main configure,1.443,1.444 Makefile,1.179,1.180

[Atmosfear]

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

Modified Files:
	configure Makefile 
Log Message:
Allow disabling of libfame and allow to enforce (not) building libavcodec.


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- configure	26 Apr 2002 15:35:00 -0000	1.443
+++ configure	26 Apr 2002 17:18:01 -0000	1.444
@@ -130,6 +130,8 @@
   --disable-xvid         disable XviD codec [autodetect]
   --disable-divx4linux   disable DivX4linux codec [autodetect]
   --enable-opendivx      enable _old_ OpenDivx codec [disable]
+  --disable-libavcodec   disable libavcodec [autodetect]
+  --disable-libfame      disable libfame realtime-encoder [autodetect]
   --enable-vorbis        build with OggVorbis support [autodetect]
   --enable-faad          build with FAAD (AAC) support [autodetect]
   --disable-iconv        do not use iconv(3) function [autodetect]
@@ -765,6 +767,7 @@
 # If autodetection is available then the third state is: auto
 _libavcodec=auto
 _libavcodecso=no # changed default to no as it causes problems - atmos
+_fame=auto
 _mp1e=no
 _mencoder=yes
 _x11=auto
@@ -946,6 +949,10 @@
   --disable-divx4linux)	_divx4linux=no	;;
   --enable-opendivx)	_opendivx=yes	;;
   --disable-opendivx)	_opendivx=no	;;
+  --enable-libavcodec)	_libavcodec=yes	;;
+  --disable-libavcodec)	_libavcodec=no	;;
+  --enable-libfame)	_fame=yes	;;
+  --disable-libfame)	_fame=no	;;
   --enable-lirc)	_lirc=yes	;;
   --disable-lirc)	_lirc=no	;;
   --enable-gui)		_gui=yes	;;
@@ -3021,6 +3028,27 @@
   _nocodecmodules="libavcodec $_nocodecmodules"
 fi
 
+echocheck "libfame"
+if test "$_fame" = auto ; then
+  _fame=no
+  if test -d libfame && test -f libfame/fame.h ; then
+    # disable fame on cygwin as no sense to port - atmos	  
+    cygwin || _fame=yes
+    echores $_fame
+  else
+    echores "no (no fame dir)"
+  fi
+else
+  echores "$_fame"
+fi
+
+_def_fame='#undef USE_LIBFAME'
+if test "$_fame" = yes ; then
+  _def_fame='#define USE_LIBFAME 1'	
+  _ld_fame='-Llibfame -lfame'	
+  _dep_fame='libfame/libfame.a'
+fi  
+
 echocheck "libdv-0.9.5 (for mencoder)"
 if test "$_libdv" = auto ; then
   _libdv=no
@@ -3581,6 +3609,9 @@
 DS_LIB = $_ld_dshow
 AV_DEP = $_dep_libavcodec
 AV_LIB = $_ld_libavcodec
+FAME = $_fame
+FAME_LIB = $_ld_fame
+FAME_DEB = $_dep_fame
 MP1E_DEP = $_dep_mp1e
 MP1E_LIB = $_ld_mp1e
 ARCH_LIB =  $_ld_arch $_ld_iconv
@@ -3794,6 +3825,9 @@
 #define CONFIG_DECODERS 1
 /* Use libavcodec's encoders */
 #define CONFIG_ENCODERS 1
+
+/* Use libfame encoder filter */
+$_def_fame
 
 /* XAnim DLL support */
 $_def_xanim

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- Makefile	24 Apr 2002 20:08:06 -0000	1.179
+++ Makefile	26 Apr 2002 17:18:01 -0000	1.180
@@ -44,7 +44,7 @@
 AO_LIBS = -Llibao2 -lao2
 A_LIBS = $(ALSA_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(SGIAUDIO_LIB)
 
-CODEC_LIBS = -Llibmpcodecs -lmpcodecs -Lmp3lib -lMP3 -Lliba52 -la52 -Llibmpeg2 -lmpeg2 $(AV_LIB) -Llibfame -lfame
+CODEC_LIBS = -Llibmpcodecs -lmpcodecs -Lmp3lib -lMP3 -Lliba52 -la52 -Llibmpeg2 -lmpeg2 $(AV_LIB) $(FAME_LIB)
 COMMON_LIBS = $(CODEC_LIBS) -Llibmpdemux -lmpdemux  $(NEW_INPUT_LIB)  $(LIB_LOADER) $(A_LIBS) $(CSS_LIB) $(ARCH_LIB) -Lpostproc -lpostproc $(DECORE_LIB) -Llinux -losdep $(TERMCAP_LIB)  $(STREAMING_LIB) $(Z_LIB) $(GTK_LIBS) $(PNG_LIB) $(JPEG_LIB) -lm
 ifeq ($(VIDIX),yes)
 MISC_LIBS += -Llibdha -ldha -Lvidix -lvidix
@@ -91,7 +91,7 @@
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-COMMON_DEPS = libfame/libfame.a libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a
+COMMON_DEPS = $(FAME_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a
 
 ifeq ($(VIDIX),yes)
 COMMON_DEPS += libdha/libdha.so vidix/libvidix.a