comparison configure @ 11492:ad57fa26c89b

remove useless --with-xvidcore option and add *-xvidlibdir and *-xvidincdir

11491:5af505348795

  --with-codecsdir=DIR     Binary codec files in DIR
  --with-win32libdir=DIR   W*ndows DLL files in DIR
  --with-xanimlibdir=DIR   XAnim DLL files in DIR
  --with-reallibdir=DIR    RealPlayer DLL files in DIR
  --with-xvmclib=PATH      path to adapter specific XvMCxxxxx.so (e.g. NVIDIA)
  --with-xvidcore=PATH     path to XviD libxvidcore.a
                           (e.g. /opt/lib/libxvidcore.a)
  --with-sdl-config=PATH   path to sdl*-config (e.g. /opt/bin/sdl-config)
  --with-freetype-config=PATH  path to freetype-config
                               (e.g. /opt/bin/freetype-config)
  --with-gtk-config=PATH   path to gtk*-config (e.g. /opt/bin/gtk-config)
  --with-glib-config=PATH  path to glib*-config (e.g. /opt/bin/glib-config)

fi


_prefix="/usr/local"
_xvmclib="XvMCNVIDIA"
_xvidcore="xvidcore"

# GOTCHA: the variables below defines the default behavior for autodetection
# and have - unless stated otherwise - at least 2 states : yes no
# If autodetection is available then the third state is: auto
_libavcodec=auto

    _xvmclib=`echo $ac_option | cut -d '=' -f 2`
    ;;
  --with-dvbincdir=*)
    _inc_dvb=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
    ;;
  --with-xvidcore=*)
    _xvidcore=`echo $ac_option | cut -d '=' -f 2`
    ;;
  --with-sdl-config=*)
    _sdlconfig=`echo $ac_option | cut -d '=' -f 2`
    ;;
  --with-freetype-config=*)

echocheck "XviD"
cat > $TMPC << EOF
#include <xvid.h>
int main(void) { xvid_init(0, 0, 0, 0); return 0; }
EOF
if test "$_xvid" != no && cc_check -l$_xvidcore -lm ; then
  _xvid=yes
  _ld_xvid="-l$_xvidcore"
  _def_xvid3='#define HAVE_XVID3 1'
  _def_xvid4='#undef HAVE_XVID4'
  _codecmodules="xvid $_codecmodules"
else
cat > $TMPC << EOF
#include <xvid.h>
int main(void) { xvid_global(0, 0, 0, 0); return 0; }
EOF
  if test "$_xvid" != no && cc_check -l$_xvidcore -lm ; then
  _xvid=yes
    _ld_xvid="-l$_xvidcore"
    _def_xvid3='#undef HAVE_XVID3'
    _def_xvid4='#define HAVE_XVID4 1'
  _codecmodules="xvid $_codecmodules"
  else
  _xvid=no
  _ld_xvid=''
    _def_xvid3='#undef HAVE_XVID3'
    _def_xvid4='#undef HAVE_XVID4'
  _nocodecmodules="xvid $_nocodecmodules"
  fi
fi
echores "$_xvid"

_xvidcompat=no

FAME_LIB = $_ld_fame
MP1E_DEP = $_dep_mp1e
MP1E_LIB = $_ld_mp1e
ARCH_LIB =  $_ld_arch $_ld_iconv
XVID = $_xvid
XVID_LIB = $_ld_xvid
DECORE_LIB = $_ld_decore $_ld_mp3lame
MENCODER = $_mencoder
ENCORE_LIB =  $_ld_encore $_ld_mp3lame
DIRECTFB_INC = $_inc_directfb

11492:ad57fa26c89b

  --with-codecsdir=DIR     Binary codec files in DIR
  --with-win32libdir=DIR   W*ndows DLL files in DIR
  --with-xanimlibdir=DIR   XAnim DLL files in DIR
  --with-reallibdir=DIR    RealPlayer DLL files in DIR
  --with-xvmclib=PATH      path to adapter specific XvMCxxxxx.so (e.g. NVIDIA)
  --with-xvidlibdir=DIR    libxvidcore (XviD) in DIR 
  --with-xvidincdir=DIR    XviD header in DIR
  
  --with-sdl-config=PATH   path to sdl*-config (e.g. /opt/bin/sdl-config)
  --with-freetype-config=PATH  path to freetype-config
                               (e.g. /opt/bin/freetype-config)
  --with-gtk-config=PATH   path to gtk*-config (e.g. /opt/bin/gtk-config)
  --with-glib-config=PATH  path to glib*-config (e.g. /opt/bin/glib-config)

fi


_prefix="/usr/local"
_xvmclib="XvMCNVIDIA"

# GOTCHA: the variables below defines the default behavior for autodetection
# and have - unless stated otherwise - at least 2 states : yes no
# If autodetection is available then the third state is: auto
_libavcodec=auto

    _xvmclib=`echo $ac_option | cut -d '=' -f 2`
    ;;
  --with-dvbincdir=*)
    _inc_dvb=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
    ;;
  --with-xvidlibdir=*)
    _ld_xvid=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
    ;;
  --with-xvidincdir=*)
    _inc_xvid=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
    ;;
  --with-sdl-config=*)
    _sdlconfig=`echo $ac_option | cut -d '=' -f 2`
    ;;
  --with-freetype-config=*)

echocheck "XviD"
cat > $TMPC << EOF
#include <xvid.h>
int main(void) { xvid_init(0, 0, 0, 0); return 0; }
EOF
_ld_xvid="$_ld_xvid -lxvidcore"
if test "$_xvid" != no && cc_check $_inc_xvid $_ld_xvid ; then
  _xvid=yes
  _def_xvid3='#define HAVE_XVID3 1'
  _def_xvid4='#undef HAVE_XVID4'
  _codecmodules="xvid $_codecmodules"
else
cat > $TMPC << EOF
#include <xvid.h>
int main(void) { xvid_global(0, 0, 0, 0); return 0; }
EOF
  if test "$_xvid" != no && cc_check $_inc_xvid $_ld_xvid ; then
    _xvid=yes
    _def_xvid3='#undef HAVE_XVID3'
    _def_xvid4='#define HAVE_XVID4 1'
    _codecmodules="xvid $_codecmodules"
  else
    _xvid=no
    _ld_xvid=''
    _def_xvid3='#undef HAVE_XVID3'
    _def_xvid4='#undef HAVE_XVID4'
    _nocodecmodules="xvid $_nocodecmodules"
  fi
fi
echores "$_xvid"

_xvidcompat=no

FAME_LIB = $_ld_fame
MP1E_DEP = $_dep_mp1e
MP1E_LIB = $_ld_mp1e
ARCH_LIB =  $_ld_arch $_ld_iconv
XVID = $_xvid
XVID_INC = $_inc_xvid
XVID_LIB = $_ld_xvid
DECORE_LIB = $_ld_decore $_ld_mp3lame
MENCODER = $_mencoder
ENCORE_LIB =  $_ld_encore $_ld_mp3lame
DIRECTFB_INC = $_inc_directfb