comparison configure @ 30846:72ae3dd3aa6e

Replace separate Win32, XAnim and Real codec directories by one global dir. Nowadays MPlayer does not use the codecs from other installed programs. A runtime setting will soon take over the rare case that binary codecs should be searched for in non-standard directories.

30845:ab30cba9b037

  --mandir=DIR           directory for installing man pages [PREFIX/share/man]
  --confdir=DIR          directory for installing configuration files
                         [PREFIX/etc/mplayer]
  --libdir=DIR           directory for object code libraries [PREFIX/lib]
  --codecsdir=DIR        directory for binary codecs [LIBDIR/codecs]
  --win32codecsdir=DIR   directory for Windows DLLs [LIBDIR/codecs]
  --xanimcodecsdir=DIR   directory for XAnim codecs [LIBDIR/codecs]
  --realcodecsdir=DIR    directory for RealPlayer codecs [LIBDIR/codecs]

Optional features:
  --disable-mencoder     disable MEncoder (A/V encoder) compilation [enable]
  --disable-mplayer      disable MPlayer compilation [enable]
  --enable-gui           enable GMPlayer compilation (GTK+ GUI) [disable]

  --libdir=*)
    _libdir=$(echo $ac_option | cut -d '=' -f 2)
    ;;
  --codecsdir=*)
    _codecsdir=$(echo $ac_option | cut -d '=' -f 2)
    ;;
  --win32codecsdir=*)
    _win32codecsdir=$(echo $ac_option | cut -d '=' -f 2)
    ;;
  --xanimcodecsdir=*)
    _xanimcodecsdir=$(echo $ac_option | cut -d '=' -f 2)
    ;;
  --realcodecsdir=*)
    _realcodecsdir=$(echo $ac_option | cut -d '=' -f 2)
    ;;

  --with-install=*)
    _install=$(echo $ac_option | cut -d '=' -f 2 )
    ;;

    _win32dll=yes
  fi
fi
if test "$_win32dll" = yes ; then
  def_win32dll='#define CONFIG_WIN32DLL 1'
  test -z "$_win32codecsdir" && _win32codecsdir=$_codecsdir
  _res_comment="using $_win32codecsdir"
  if ! win32 ; then
    def_win32_loader='#define WIN32_LOADER 1'
    _win32_emulation=yes
  else
    extra_ldflags="$extra_ldflags -ladvapi32 -lole32"

  if test "$_dl" = yes ; then
    _xanim=yes
  fi
fi
if test "$_xanim" = yes ; then
  test -z "$_xanimcodecsdir" && _xanimcodecsdir=$_codecsdir
  def_xanim='#define CONFIG_XANIM 1'
  def_xanim_path="#define XACODEC_PATH \"$_xanimcodecsdir\""
  _codecmodules="xanim $_codecmodules"
  _res_comment="using $_xanimcodecsdir"
else
  def_xanim='#undef CONFIG_XANIM'
  def_xanim_path='#undef XACODEC_PATH'
  _nocodecmodules="xanim $_nocodecmodules"
fi
echores "$_xanim"

     (linux || freebsd || netbsd || openbsd || dragonfly || darwin || win32 || os2) ; then
    _real=yes
  fi
fi
if test "$_real" = yes ; then
  test -z "$_realcodecsdir" && _realcodecsdir="$_codecsdir"
  def_real='#define CONFIG_REALCODECS 1'
  def_real_path="#define REALCODEC_PATH \"$_realcodecsdir\""
  _codecmodules="real $_codecmodules"
  _res_comment="using $_realcodecsdir"
else
  def_real='#undef CONFIG_REALCODECS'
  def_real_path="#undef REALCODEC_PATH"
  _nocodecmodules="real $_nocodecmodules"
fi
echores "$_real"

/* binary codecs */
$def_qtx
$def_qtx_win32
$def_real
$def_real_path
$def_win32_loader
$def_win32dll
#define WIN32_PATH "$_win32codecsdir"
$def_xanim
$def_xanim_path
$def_xmms
#define XMMS_INPUT_PLUGIN_DIR "$_xmmsplugindir"


/* GUI */
$def_gtk2

30846:72ae3dd3aa6e

  --mandir=DIR           directory for installing man pages [PREFIX/share/man]
  --confdir=DIR          directory for installing configuration files
                         [PREFIX/etc/mplayer]
  --libdir=DIR           directory for object code libraries [PREFIX/lib]
  --codecsdir=DIR        directory for binary codecs [LIBDIR/codecs]

Optional features:
  --disable-mencoder     disable MEncoder (A/V encoder) compilation [enable]
  --disable-mplayer      disable MPlayer compilation [enable]
  --enable-gui           enable GMPlayer compilation (GTK+ GUI) [disable]

  --libdir=*)
    _libdir=$(echo $ac_option | cut -d '=' -f 2)
    ;;
  --codecsdir=*)
    _codecsdir=$(echo $ac_option | cut -d '=' -f 2)
    ;;

  --with-install=*)
    _install=$(echo $ac_option | cut -d '=' -f 2 )
    ;;

    _win32dll=yes
  fi
fi
if test "$_win32dll" = yes ; then
  def_win32dll='#define CONFIG_WIN32DLL 1'
  if ! win32 ; then
    def_win32_loader='#define WIN32_LOADER 1'
    _win32_emulation=yes
  else
    extra_ldflags="$extra_ldflags -ladvapi32 -lole32"

  if test "$_dl" = yes ; then
    _xanim=yes
  fi
fi
if test "$_xanim" = yes ; then
  def_xanim='#define CONFIG_XANIM 1'
  _codecmodules="xanim $_codecmodules"
else
  def_xanim='#undef CONFIG_XANIM'
  _nocodecmodules="xanim $_nocodecmodules"
fi
echores "$_xanim"

     (linux || freebsd || netbsd || openbsd || dragonfly || darwin || win32 || os2) ; then
    _real=yes
  fi
fi
if test "$_real" = yes ; then
  def_real='#define CONFIG_REALCODECS 1'
  _codecmodules="real $_codecmodules"
else
  def_real='#undef CONFIG_REALCODECS'
  _nocodecmodules="real $_nocodecmodules"
fi
echores "$_real"

/* binary codecs */
$def_qtx
$def_qtx_win32
$def_real
$def_win32_loader
$def_win32dll
$def_xanim
$def_xmms
#define BINARY_CODECS_PATH "$_codecsdir"
#define XMMS_INPUT_PLUGIN_DIR "$_xmmsplugindir"


/* GUI */
$def_gtk2