[Mplayer-cvslog] CVS: main Makefile,1.277,1.278 configure,1.813,1.814

[Ivan Kalvachev CVS]

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

Modified Files:
	Makefile configure 
Log Message:
remove useless --with-xvidcore option and add *-xvidlibdir and *-xvidincdir

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -r1.277 -r1.278
--- Makefile	19 Oct 2003 20:20:45 -0000	1.277
+++ Makefile	18 Nov 2003 02:32:42 -0000	1.278
@@ -38,7 +38,7 @@
 CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(MATROSKA_LIB) 
 COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FLAC_LIB)
 
-CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) # -Wall
+CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) # -Wall
 
 PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libao2 drivers osdep postproc input libvo libaf
 ifeq ($(INTERNAL_FAAD),yes)

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.813
retrieving revision 1.814
diff -u -r1.813 -r1.814
--- configure	16 Nov 2003 09:25:13 -0000	1.813
+++ configure	18 Nov 2003 02:32:42 -0000	1.814
@@ -308,8 +308,9 @@
   --with-xanimlibdir=DIR   XAnim DLL files in DIR
   --with-reallibdir=DIR    RealPlayer DLL files in DIR
   --with-xvmclib=PATH      path to adapter specific XvMCxxxxx.so (e.g. NVIDIA)
-  --with-xvidcore=PATH     path to XviD libxvidcore.a
-                           (e.g. /opt/lib/libxvidcore.a)
+  --with-xvidlibdir=DIR    libxvidcore (XviD) in DIR 
+  --with-xvidincdir=DIR    XviD header in DIR
+  
   --with-sdl-config=PATH   path to sdl*-config (e.g. /opt/bin/sdl-config)
   --with-freetype-config=PATH  path to freetype-config
                                (e.g. /opt/bin/freetype-config)
@@ -1079,7 +1080,6 @@
 
 _prefix="/usr/local"
 _xvmclib="XvMCNVIDIA"
-_xvidcore="xvidcore"
 
 # GOTCHA: the variables below defines the default behavior for autodetection
 # and have - unless stated otherwise - at least 2 states : yes no
@@ -1531,8 +1531,11 @@
   --with-dvbincdir=*)
     _inc_dvb=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
     ;;
-  --with-xvidcore=*)
-    _xvidcore=`echo $ac_option | cut -d '=' -f 2`
+  --with-xvidlibdir=*)
+    _ld_xvid=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
+    ;;
+  --with-xvidincdir=*)
+    _inc_xvid=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
     ;;
   --with-sdl-config=*)
     _sdlconfig=`echo $ac_option | cut -d '=' -f 2`
@@ -4964,9 +4967,9 @@
 #include <xvid.h>
 int main(void) { xvid_init(0, 0, 0, 0); return 0; }
 EOF
-if test "$_xvid" != no && cc_check -l$_xvidcore -lm ; then
+_ld_xvid="$_ld_xvid -lxvidcore"
+if test "$_xvid" != no && cc_check $_inc_xvid $_ld_xvid ; then
   _xvid=yes
-  _ld_xvid="-l$_xvidcore"
   _def_xvid3='#define HAVE_XVID3 1'
   _def_xvid4='#undef HAVE_XVID4'
   _codecmodules="xvid $_codecmodules"
@@ -4975,18 +4978,17 @@
 #include <xvid.h>
 int main(void) { xvid_global(0, 0, 0, 0); return 0; }
 EOF
-  if test "$_xvid" != no && cc_check -l$_xvidcore -lm ; then
-  _xvid=yes
-    _ld_xvid="-l$_xvidcore"
+  if test "$_xvid" != no && cc_check $_inc_xvid $_ld_xvid ; then
+    _xvid=yes
     _def_xvid3='#undef HAVE_XVID3'
     _def_xvid4='#define HAVE_XVID4 1'
-  _codecmodules="xvid $_codecmodules"
+    _codecmodules="xvid $_codecmodules"
   else
-  _xvid=no
-  _ld_xvid=''
+    _xvid=no
+    _ld_xvid=''
     _def_xvid3='#undef HAVE_XVID3'
     _def_xvid4='#undef HAVE_XVID4'
-  _nocodecmodules="xvid $_nocodecmodules"
+    _nocodecmodules="xvid $_nocodecmodules"
   fi
 fi
 echores "$_xvid"
@@ -5845,6 +5847,7 @@
 MP1E_LIB = $_ld_mp1e
 ARCH_LIB =  $_ld_arch $_ld_iconv
 XVID = $_xvid
+XVID_INC = $_inc_xvid
 XVID_LIB = $_ld_xvid
 DECORE_LIB = $_ld_decore $_ld_mp3lame
 MENCODER = $_mencoder