[Mplayer-cvslog] CVS: main Makefile,1.121,1.122 configure,1.324,1.325

[Atmosfear]

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

Modified Files:
	Makefile configure 
Log Message:
MP1E configure patch by D. Holm.


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- Makefile	10 Dec 2001 01:34:14 -0000	1.121
+++ Makefile	10 Dec 2001 14:41:41 -0000	1.122
@@ -35,12 +35,12 @@
 VO_LIBS = -Llibvo -lvo
 VO_INC = -Ilibvo
 endif
-V_LIBS = $(X_LIB) $(DXR3_LIB) $(GGI_LIB) $(MLIB_LIB) $(PNG_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA_LIB) $(DIRECTFB_LIB)
+V_LIBS = $(X_LIB) $(MP1E_LIB) $(GGI_LIB) $(MLIB_LIB) $(PNG_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA_LIB) $(DIRECTFB_LIB)
 
 AO_LIBS = -Llibao2 -lao2
 A_LIBS = $(ALSA_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(SGIAUDIO_LIB)
 
-CODEC_LIBS = -Lg72x -lg72x -Lmp3lib -lMP3 -Llibac3 -lac3 -Lliba52 -la52 -Lxa -lxa -Llibmpeg2 -lmpeg2 -Llibmp1e -lmp1e $(AV_LIB)
+CODEC_LIBS = -Lg72x -lg72x -Lmp3lib -lMP3 -Llibac3 -lac3 -Lliba52 -la52 -Lxa -lxa -Llibmpeg2 -lmpeg2 $(AV_LIB)
 COMMON_LIBS = -Llinux -losdep -Lpostproc -lpostproc
 
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(VO_INC) $(EXTRA_INC) # -Wall
@@ -84,7 +84,7 @@
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-COMMON_DEPS = g72x/libg72x.a libmpdemux/libmpdemux.a libao2/libao2.a libac3/libac3.a liba52/liba52.a mp3lib/libMP3.a libmp1e/libmp1e.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
+COMMON_DEPS = g72x/libg72x.a libmpdemux/libmpdemux.a libao2/libao2.a libac3/libac3.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
 
 ifeq ($(VO2),yes)
 COMMON_DEPS += libvo2/libvo2.a
@@ -149,8 +149,8 @@
 g72x/libg72x.a:
 	$(MAKE) -C g72x
 
-MPLAYER_DEP = $(OBJS_MPLAYER) $(LOADER_DEP) $(AV_DEP) $(COMMON_DEPS) 
-MENCODER_DEP = $(OBJS_MENCODER) $(LOADER_DEP) $(AV_DEP) $(COMMON_DEPS)
+MPLAYER_DEP = $(OBJS_MPLAYER) $(LOADER_DEP) $(MP1E_DEP) $(AV_DEP) $(COMMON_DEPS) 
+MENCODER_DEP = $(OBJS_MENCODER) $(LOADER_DEP) $(MP1E_DEP) $(AV_DEP) $(COMMON_DEPS)
 
 ifeq ($(GUI),yes)
 MPLAYER_DEP += Gui/libgui.a

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- configure	10 Dec 2001 12:07:03 -0000	1.324
+++ configure	10 Dec 2001 14:41:41 -0000	1.325
@@ -126,6 +126,7 @@
   --enable-vorbis        build with OggVorbis support [autodetect]
   --disable-iconv        do not use iconv(3) function [autodetect]
   --disable-rtc          disable RTC (/dev/rtc) on Linux [autodetect]
+  --disable-mp1e	 disable libmp1e support (only if it won't compile) [enable]
 
 Video:
   --enable-gl            build with OpenGL render support [autodetect]
@@ -640,6 +641,7 @@
 # If autodetection is available then the third state is: auto
 _libavcodec=auto
 _libavcodecso=no # changed default to no as it causes problems - atmos
+_mp1e=yes
 _mencoder=auto
 _x11=auto
 _dga=auto	# 1 2 no auto
@@ -735,6 +737,7 @@
   --disable-iconv)	_iconv=no	;;
   --enable-rtc)	        _rtc=yes	;;
   --disable-rtc)	_rtc=no	        ;;
+  --disable-mp1e)	_mp1e=no	;;
   --enable-ossaudio)	_ossaudio=yes	;;
   --disable-ossaudio)	_ossaudio=no	;;
   --enable-mad)		_mad=yes	;;
@@ -1810,6 +1813,22 @@
 fi
 echores "$_nas"
 
+if test "$_mmx" = no ; then
+  _mp1e=no
+fi
+if test "$_mp1e" = yes ; then
+  _def_mp1e='#define USE_MP1E'
+  _ld_mp1e="-Llibmp1e -lmp1e"
+  _dep_mp1e='libmp1e/libmp1e.a'
+else
+  echocheck "libmp1e"
+  _mp1e=no
+  _def_mp1e='#undef USE_MP1E'
+  _ld_mp1e=""
+  _dep_mp1e=''
+  echores "$_mp1e"
+fi
+
 echocheck "DXR3/H+"
 if test "$_dxr3" = auto ; then
   cat > $TMPC << EOF
@@ -2650,6 +2669,8 @@
 DS_LIB = $_ld_dshow
 AV_DEP = $_dep_libavcodec
 AV_LIB = $_ld_libavcodec
+MP1E_DEP = $_dep_mp1e
+MP1E_LIB = $_ld_mp1e
 ARCH_LIB =  $_ld_arch $_ld_iconv
 DIVX4LINUX = $_divx4linux
 DECORE_LIB = $_ld_decore
@@ -2714,6 +2735,9 @@
 /* Indicates if libmp3lame is available
    Note: REQUIRED for mencoder */
 $_def_mp3lame
+
+/* Define libmp1e */
+$_def_mp1e
 
 /* Define this to enable avg. byte/sec-based AVI sync method by default:
    (use -bps or -nobps commandline option for run-time method selection)