[Mplayer-cvslog] CVS: main configure,1.111,1.112 mplayer.c,1.184,1.185

[Arpi of Ize]

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

Modified Files:
	configure mplayer.c 
Log Message:
Applied DATADIR patch by Vladimir Kushnir

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- configure	19 Jul 2001 22:39:52 -0000	1.111
+++ configure	20 Jul 2001 00:01:08 -0000	1.112
@@ -116,6 +116,8 @@
 params:
         --cc                    use this C compiler to build MPlayer [gcc]
 	--prefix=DIR		use this prefix for installing mplayer [/usr/local]
+	--datadir=DIR           use this prefix for installing machine independent
+				data [/usr/local/share/mplayer] 
 	--enable-debug[=1-3]	compile debugging information into mplayer [disable]
 	--enable-profile	compile profiling information into mplayer [disable]
         --enable-mmx            build with mmx support [autodetect]
@@ -915,6 +917,7 @@
 # check for the parameters.
 
 _prefix="/usr/local"
+_datadir=$_prefix"/share/mplayer"
 
 for ac_option
 do
@@ -1141,6 +1144,9 @@
   --prefix=*)
 	_prefix=`echo $ac_option | cut -d '=' -f 2`
         ;;
+  --datadir=*)
+	_datadir=`echo $ac_option | cut -d '=' -f 2`
+	;;
   --cc=*)
 	;;
   --as=*)
@@ -1249,6 +1255,7 @@
 
 # to screen.
 echo "Install prefix: $_prefix"
+echo "Data directory: $_datadir"
 if [ "$host_arch" = i386 ]; then
     echo "Checking for cpu vendor ... $pvendor ( $pfamily:$pmodel:$pstepping )"
     echo "Checking for cpu type ... $pname"
@@ -1721,6 +1728,9 @@
 cat > $CCONF << EOF
 
 /* -------- Generated by ./configure ----------- */
+
+/* Common data directory (for fonts, etc) */
+#define DATADIR "$_datadir"
 
 /* Define for using new DivX4Linux library, instead of open-source OpenDivX */
 /* You have to change DECORE_LIBS in config.mak too! */

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- mplayer.c	16 Jul 2001 20:21:26 -0000	1.184
+++ mplayer.c	20 Jul 2001 00:01:08 -0000	1.185
@@ -568,9 +568,11 @@
 
 // check codec.conf
 if(!parse_codec_cfg(get_path("codecs.conf"))){
-    fprintf(stderr,"(copy/link DOCS/codecs.conf to ~/.mplayer/codecs.conf)\n");
+  if(!parse_codec_cfg(DATADIR"/codecs.conf")){
+    printf("(copy/link DOCS/codecs.conf to ~/.mplayer/codecs.conf)\n");
     GUI_MSG( mplCodecConfNotFound )
     exit(1);
+  }
 }
 
 // check font
@@ -580,6 +582,8 @@
   } else {
       // try default:
        vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
+       if(!vo_font)
+       vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1);
   }
 
 // check .sub