[Mplayer-cvslog] CVS: main configure,1.334,1.335

Arpi of Ize arpi at mplayer.dev.hu
Tue Dec 25 22:58:12 CET 2001


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

Modified Files:
	configure 
Log Message:
--confdir

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- configure	24 Dec 2001 02:56:02 -0000	1.334
+++ configure	25 Dec 2001 21:58:10 -0000	1.335
@@ -108,7 +108,9 @@
 Installation directories:
   --prefix=DIR           use this prefix for installing mplayer [/usr/local]
   --datadir=DIR          use this prefix for installing machine independent
-                         data [/usr/local/share/mplayer]
+                         data files (fonts, skins) [PREFIX/share/mplayer]
+  --confdir=DIR          use this prefix for installing configuration files
+                         [same as datadir]
 
 Optional features:
   --disable-mencoder     disable mencoder [autodetect]
@@ -882,6 +884,9 @@
   --datadir=*)
     _datadir=`echo $ac_option | cut -d '=' -f 2`
     ;;
+  --confdir=*)
+    _confdir=`echo $ac_option | cut -d '=' -f 2`
+    ;;
 
 
   *)
@@ -893,7 +898,7 @@
 
 # Atmos: moved this here, to be correct, if --prefix is specified
 test -z "$_datadir" && _datadir=$_prefix"/share/mplayer"
-
+test -z "$_confdir" && _confdir=$_datadir
 
 
 if x86 ; then
@@ -2638,6 +2643,8 @@
 LANG = C
 TARGET_OS = $system_name
 prefix = $_prefix
+DATADIR = $_datadir
+CONFDIR = $_confdir
 AR = ar
 CC = $_cc
 # OPTFLAGS = -O4 $_profile $_debug $_march $_mcpu -pipe -fomit-frame-pointer -ffast-math
@@ -2736,6 +2743,7 @@
 
 /* Common data directory (for fonts, etc) */
 #define DATADIR "$_datadir"
+#define CONFDIR "$_confdir"
 
 /* Define this to compile stream-caching support, it can be enabled via
    -cache <kilobytes> */
@@ -3031,6 +3039,7 @@
 
   Install prefix: $_prefix
   Data directory: $_datadir
+  Config direct.: $_confdir
 
   Enabled optional drivers:
     Input: $_inputmodules




More information about the MPlayer-cvslog mailing list