comparison configure @ 21094:85e28925e490

Remove --with-xvidlibdir.

21093:681dd07dea6c

multiple paths separated by ':'):
  --extra-libs=FLAGS          extra linker flags
  --with-extraincdir=DIR      extra header search paths in DIR (*)
  --with-extralibdir=DIR      extra linker search paths in DIR (*)
  --with-x11libdir=DIR        X library files in DIR (*)
  --with-xvidlibdir=DIR       libxvidcore (XviD) in DIR  (*)
  --with-x264libdir=DIR       libx264 in DIR
  --with-livelibdir=DIR       LIVE555 Streaming Media in DIR
  --with-xmmsplugindir=DIR    XMMS plugins in DIR
  --with-xmmslibdir=DIR       libxmms.so.1 in DIR
  --with-xvmclib=NAME         adapter-specific library name (e.g. XvMCNVIDIA)

    _ld_x11=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
    ;;
  --with-xvmclib=*)
    _xvmclib=`echo $ac_option | cut -d '=' -f 2`
    ;;
  --with-xvidlibdir=*)
    _ld_xvid=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
    ;;
  --with-x264libdir=*)
    _ld_x264=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
    ;;
  --with-sdl-config=*)
    _sdlconfig=`echo $ac_option | cut -d '=' -f 2`

echocheck "XviD"
if test "$_xvid" = auto ; then
  _xvid=no
  _ld_xvid="$_ld_xvid -lxvidcore $_ld_lm"
  cat > $TMPC << EOF
#include <xvid.h>
int main(void) { xvid_global(0, 0, 0, 0); return 0; }
EOF
  for _ld_tmp in "$_ld_xvid" "$_ld_xvid $_ld_pthread" ; do
    cc_check $_ld_tmp && _ld_xvid="$_ld_tmp" && _xvid=yes && break
  done
fi
  
if test "$_xvid" = yes ; then
  _def_xvid='#define HAVE_XVID4 1'
  _codecmodules="xvid $_codecmodules"
else
  _def_xvid='#undef HAVE_XVID4'
  _nocodecmodules="xvid $_nocodecmodules"
  _ld_xvid=""
fi
echores "$_xvid"

if test "$_xvid" = yes ; then
  echocheck "XviD two pass plugin"
  cat > $TMPC << EOF
#include <xvid.h>
int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; }
EOF
  if cc_check $_ld_xvid $_ld_lb ; then
    _lavc_xvid=yes
    _def_lavc_xvid='#define CONFIG_XVID 1'
  else
    _lavc_xvid=no
    _def_lavc_xvid='#undef CONFIG_XVID'

EXTRALIBS = $_extra_libs
EXTRA_LIB = $_ld_extra \
  $_ld_static $_ld_win32 \
  $_ld_win32libs $_ld_lm $_ld_gif \
  $_ld_xvid \
  $_ld_vorbis $_ld_theora $_xmms_lib \
  $_ld_arch
VO_LIBS = $_ld_aa $_ld_sdl $_ld_ggi $_ld_svga $_ld_directfb $_ld_caca \
  $_ld_vesa $_ld_vidix_external $_ld_gl $_ld_dga $_ld_xv $_ld_xvmc $_ld_vm \
  $_ld_xinerama $_ld_x11 $_ld_sock

21094:85e28925e490

multiple paths separated by ':'):
  --extra-libs=FLAGS          extra linker flags
  --with-extraincdir=DIR      extra header search paths in DIR (*)
  --with-extralibdir=DIR      extra linker search paths in DIR (*)
  --with-x11libdir=DIR        X library files in DIR (*)
  --with-x264libdir=DIR       libx264 in DIR
  --with-livelibdir=DIR       LIVE555 Streaming Media in DIR
  --with-xmmsplugindir=DIR    XMMS plugins in DIR
  --with-xmmslibdir=DIR       libxmms.so.1 in DIR
  --with-xvmclib=NAME         adapter-specific library name (e.g. XvMCNVIDIA)

    _ld_x11=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
    ;;
  --with-xvmclib=*)
    _xvmclib=`echo $ac_option | cut -d '=' -f 2`
    ;;
  --with-x264libdir=*)
    _ld_x264=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
    ;;
  --with-sdl-config=*)
    _sdlconfig=`echo $ac_option | cut -d '=' -f 2`

echocheck "XviD"
if test "$_xvid" = auto ; then
  _xvid=no
  cat > $TMPC << EOF
#include <xvid.h>
int main(void) { xvid_global(0, 0, 0, 0); return 0; }
EOF
  for _ld_tmp in "-lxvidcore $_ld_lm" "-lxvidcore $_ld_lm $_ld_pthread" ; do
    cc_check $_ld_tmp && _ld_extra="$_ld_extra $_ld_tmp" && _xvid=yes && break
  done
fi
  
if test "$_xvid" = yes ; then
  _def_xvid='#define HAVE_XVID4 1'
  _codecmodules="xvid $_codecmodules"
else
  _def_xvid='#undef HAVE_XVID4'
  _nocodecmodules="xvid $_nocodecmodules"
fi
echores "$_xvid"

if test "$_xvid" = yes ; then
  echocheck "XviD two pass plugin"
  cat > $TMPC << EOF
#include <xvid.h>
int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; }
EOF
  if cc_check ; then
    _lavc_xvid=yes
    _def_lavc_xvid='#define CONFIG_XVID 1'
  else
    _lavc_xvid=no
    _def_lavc_xvid='#undef CONFIG_XVID'

EXTRALIBS = $_extra_libs
EXTRA_LIB = $_ld_extra \
  $_ld_static $_ld_win32 \
  $_ld_win32libs $_ld_lm $_ld_gif \
  $_ld_vorbis $_ld_theora $_xmms_lib \
  $_ld_arch
VO_LIBS = $_ld_aa $_ld_sdl $_ld_ggi $_ld_svga $_ld_directfb $_ld_caca \
  $_ld_vesa $_ld_vidix_external $_ld_gl $_ld_dga $_ld_xv $_ld_xvmc $_ld_vm \
  $_ld_xinerama $_ld_x11 $_ld_sock