[Mplayer-cvslog] CVS: main Makefile,1.138,1.139 configure,1.360,1.361

[Nick Kurshev]

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

Modified Files:
	Makefile configure 
Log Message:
Configurable VIDIX usage

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- Makefile	11 Jan 2002 16:06:44 -0000	1.138
+++ Makefile	11 Jan 2002 17:20:42 -0000	1.139
@@ -14,8 +14,10 @@
 PRG_CFG = codec-cfg
 PRG_MENCODER = mencoder
 # these subdirectories required installation due binaries within them
-SUBDIRS = libdha vidix
+ifeq ($(VIDIX),yes)
+SUBDIRS += libdha vidix
 DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
+endif
 
 #prefix = /usr/local
 BINDIR = ${prefix}/bin
@@ -45,12 +47,16 @@
 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 $(AV_LIB)
-COMMON_LIBS = -Llinux -losdep -Lpostproc -lpostproc -Lvidix -lvidix
-MISC_LIBS = -Llibdha -ldha
-
+COMMON_LIBS = -Llinux -losdep -Lpostproc -lpostproc
+ifeq ($(VIDIX),yes)
+MISC_LIBS += -Llibdha -ldha -Lvidix -lvidix
+endif
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(VO_INC) $(EXTRA_INC) # -Wall
 
-PARTS = g72x libmpdemux mp3lib libac3 liba52 libmp1e libmpeg2 opendivx libavcodec libao2 drivers drivers/syncfb linux postproc xa libdha vidix
+PARTS = g72x libmpdemux mp3lib libac3 liba52 libmp1e libmpeg2 opendivx libavcodec libao2 drivers drivers/syncfb linux postproc xa
+ifeq ($(VIDIX),yes)
+PARTS += libdha vidix
+endif
 ifeq ($(VO2),yes)
 PARTS += libvo2
 else
@@ -89,8 +95,11 @@
 .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 libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a libdha/libdha.so vidix/libvidix.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 ($(VIDIX),yes)
+COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
+endif
 ifeq ($(VO2),yes)
 COMMON_DEPS += libvo2/libvo2.a
 else
@@ -172,7 +181,10 @@
 GUI_LIBS = -LGui -lgui
 endif
 
-VIDIX_LIBS = -Lvidix -lvidix
+VIDIX_LIBS =
+ifeq ($(VIDIX),yes)
+VIDIX_LIBS += -Lvidix -lvidix
+endif
 
 $(PRG):	$(MPLAYER_DEP)
 	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(VO_LIBS) $(AO_LIBS) $(LIB_LOADER) $(GUI_LIBS) $(COMMON_LIBS) $(EXTRA_LIB) $(A_LIBS) $(V_LIBS) $(LIRC_LIB) $(CSS_LIB) $(ARCH_LIB) $(DECORE_LIB) $(TERMCAP_LIB) $(STATIC_LIB) $(GTK_LIBS) $(PNG_LIB) $(Z_LIB) $(STREAMING_LIB) $(VIDIX_LIBS) -lm
@@ -197,7 +209,9 @@
 	$(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML
 
 install: $(ALL_PRG)
+ifeq ($(VIDIX),yes)
 	$(DO_MAKE)
+endif
 	if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
 	$(INSTALL) -m 755 -s $(PRG) $(BINDIR)/$(PRG)
 ifeq ($(GUI),yes)

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- configure	7 Jan 2002 12:17:21 -0000	1.360
+++ configure	11 Jan 2002 17:20:42 -0000	1.361
@@ -130,7 +130,7 @@
                          (use this option if it does not compile) [enable] 
   --disable-streaming    disable network streaming support
                          (support for: http/mms/rtp) [enable]
-
+  --disable-vidix	 disable VIDIX stuff [enable]
 Video:
   --enable-gl            build with OpenGL render support [autodetect]
   --enable-dga[=n]       build with DGA [n in {1, 2} ] support [autodetect]
@@ -705,6 +705,7 @@
 _tv=yes
 _tv_v4l=auto
 _streaming=yes
+_vidix=yes
 _divx4linux=auto
 _lirc=auto
 _gui=no
@@ -801,6 +802,8 @@
   --disable-fastmemcpy)	_fastmemcpy=no	;;
   --enable-streaming)	_streaming=yes	;;
   --disable-streaming)	_streaming=no	;;
+  --enable-vidix)	_vidix=yes	;;
+  --disable-vidix)	_vidix=no	;;
   --enable-divx4linux)	_divx4linux=yes	;;
   --disable-divx4linux)	_divx4linux=no	;;
   --enable-lirc)	_lirc=yes	;;
@@ -2732,7 +2735,9 @@
 _def_linux='#undef TARGET_LINUX'
 linux && _def_linux='#define TARGET_LINUX 1'
 
-
+_def_vidix='#define CONFIG_VIDIX 1'
+test "$_vidix" = no && _def_vidix='#undef CONFIG_VIDIX'
+echo Checking for vidix ... "$_vidix"
 #############################################################################
 echo "Creating config.mak"
 cat > config.mak << EOF
@@ -2752,6 +2757,7 @@
 
 STREAMING = $_streaming
 STREAMING_LIB = $_ld_streaming
+VIDIX = $_vidix
 
 VO2 = $_vo2
 
@@ -3038,6 +3044,9 @@
 
 $_def_streaming
 
+/* enables / disables vidix usage */
+$_def_vidix
+
 /* Extension defines */
 $_def_3dnow	// only define if you have 3DNOW (AMD k6-2, AMD Athlon, iDT WinChip, etc.)
 $_def_3dnowex	// only define if you have 3DNOWEX (AMD Athlon, etc.)
@@ -3221,6 +3230,13 @@
 If you suspect a bug, please read DOCS/bugreports.html.
 
 EOF
+
+if test "$_vidix" = no ; then
+cat <<EOF
+You've disabled VIDIX. Although it would be better to PORT it instead.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+EOF
+fi
 
 # Last move:
 rm -f "$TMPO" "$TMPC" "$TMPS" "$TMPCPP"