From 215b4996a4beceab7ed5affd01e5a2a7204d86e3 Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@mplayer2.org>
Date: Sun, 13 Jan 2013 22:33:09 +0200
Subject: [PATCH] configure: remove --datadir and other obsolete things

After OSD rendering was switched over to libass, nothing uses the
--datadir setting (font search in old code was last user). Remove the
switch. Also remove --enable-xshape (unused since internal GUI
removal) and some code remaining from ao_nas which was removed earlier.
---
 configure | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/configure b/configure
index 9b42b446d2..1cd2cd3c7b 100755
--- a/configure
+++ b/configure
@@ -294,8 +294,6 @@ Configuration:
 Installation directories:
   --prefix=DIR           prefix directory for installation [/usr/local]
   --bindir=DIR           directory for installing binaries [PREFIX/bin]
-  --datadir=DIR          directory for installing machine independent
-                         data files (skins, etc) [PREFIX/share/mplayer]
   --mandir=DIR           directory for installing man pages [PREFIX/share/man]
   --confdir=DIR          directory for installing configuration files
                          [PREFIX/etc/mplayer]
@@ -396,7 +394,6 @@ Video output:
   --enable-vm              enable XF86VidMode support [autodetect]
   --enable-xinerama        enable Xinerama support [autodetect]
   --enable-x11             enable X11 video output [autodetect]
-  --enable-xshape          enable XShape support [autodetect]
   --disable-xss            disable screensaver support via xss [autodetect]
   --enable-directfb        enable DirectFB video output [autodetect]
   --disable-tga            disable Targa video output [enable]
@@ -528,14 +525,12 @@ _prefix="/usr/local"
 ffmpeg=auto
 ffmpeg_internals=no
 _x11=auto
-_xshape=auto
 _xss=auto
 _xv=auto
 _vdpau=auto
 _sdl=auto
 _direct3d=auto
 _directx=auto
-_nas=auto
 _png=auto
 _mng=auto
 _jpeg=auto
@@ -664,9 +659,6 @@ for ac_option do
   --bindir=*)
     _bindir=$(echo $ac_option | cut -d '=' -f 2)
     ;;
-  --datadir=*)
-    _datadir=$(echo $ac_option | cut -d '=' -f 2)
-    ;;
   --mandir=*)
     _mandir=$(echo $ac_option | cut -d '=' -f 2)
     ;;
@@ -782,8 +774,6 @@ for ac_option do
   --disable-cross-compile)          _cross_compile=no           ;;
   --enable-x11)         _x11=yes        ;;
   --disable-x11)        _x11=no         ;;
-  --enable-xshape)      _xshape=yes     ;;
-  --disable-xshape)     _xshape=no      ;;
   --enable-xss)         _xss=yes        ;;
   --disable-xss)        _xss=no         ;;
   --enable-xv)          _xv=yes         ;;
@@ -1055,7 +1045,6 @@ done
 
 # Atmos: moved this here, to be correct, if --prefix is specified
 test -z "$_bindir"  && _bindir="$_prefix/bin"
-test -z "$_datadir" && _datadir="$_prefix/share/mplayer"
 test -z "$_mandir"  && _mandir="$_prefix/share/man"
 test -z "$_confdir" && _confdir="$_prefix/etc/mplayer"
 test -z "$_libdir"  && _libdir="$_prefix/lib"
@@ -2969,9 +2958,9 @@ if test "$_pthreads" = yes ; then
   def_threads='#define HAVE_THREADS 1'
   extra_cflags="$extra_cflags $THREAD_CFLAGS"
 else
-  res_comment="v4l, v4l2, ao_nas, win32 loader disabled"
+  res_comment="v4l, v4l2, win32 loader disabled"
   def_pthreads='#undef HAVE_PTHREADS'
-  _nas=no ; _tv_v4l1=no ; _tv_v4l2=no
+  _tv_v4l1=no ; _tv_v4l2=no
   mingw32 || _win32dll=no
 fi
 echores "$_pthreads"
@@ -5583,7 +5572,6 @@ MSG_LANG_ALL = $msg_lang_all
 
 prefix  = \$(DESTDIR)$_prefix
 BINDIR  = \$(DESTDIR)$_bindir
-DATADIR = \$(DESTDIR)$_datadir
 LIBDIR  = \$(DESTDIR)$_libdir
 MANDIR  = \$(DESTDIR)$_mandir
 CONFDIR = \$(DESTDIR)$_confdir
@@ -5775,7 +5763,6 @@ cat > $TMPH << EOF
 
 #define CONFIGURATION "$configuration"
 
-#define MPLAYER_DATADIR "$_datadir"
 #define MPLAYER_CONFDIR "$_confdir"
 #define MPLAYER_LOCALEDIR "$_localedir"
 
@@ -5934,7 +5921,6 @@ $def_xmms
 $def_alsa
 $def_coreaudio
 $def_jack
-$def_nas
 $def_openal
 $def_openal_h
 $def_ossaudio
@@ -6069,7 +6055,6 @@ cat << EOF
 Config files successfully generated by ./configure $configuration !
 
   Install prefix: $_prefix
-  Data directory: $_datadir
   Config direct.: $_confdir
 
   Byte order: $_byte_order
-- 
2.11.4.GIT