comparison configure @ 18978:9f97ca988ea7

Consistent option and variable naming for x11libdir and xvmclibdir.

18977:408714bc075c

  --with-toolamedir=DIR    path to Toolame library and include file
  --with-xmmsplugindir=DIR XMMS plugins in DIR
  --with-xmmslibdir=DIR    libxmms.so.1 in DIR
  --with-cdparanoiaincdir=DIR  cdparanoia headers in DIR (*)
  --with-cdparanoialibdir=DIR  cdparanoia libraries (libcdda_*) in DIR (*)
  --with-xvmclib=NAME      name of adapter-specific library (e.g. XvMCNVIDIA)
  --with-termcaplib=NAME   name of library with termcap functionality
                           name should be given without leading "lib"
                           checks for "termcap" and "tinfo"
  
  --with-freetype-config=PATH path to freetype-config

  --with-x11incdir=*)
    _inc_x11=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
    ;;
  --with-x11libdir=*)
    _x11_paths=`echo $ac_option | cut -d '=' -f 2`
    ;;
  --with-dxr2incdir=*)
    _inc_dxr2=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
    ;;
  --with-xvmclib=*)
    _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=*)

  cat > $TMPC <<EOF
#include <X11/Xlib.h>
#include <X11/Xutil.h>
int main(void) { (void) XCreateWindow(0,0,0,0,0,0,0,0,0,0,0,0); return 0; }
EOF
  if test -z "$_x11_paths" ; then
    _x11_paths="/usr/X11R6/lib /usr/lib/X11R6 /usr/X11/lib /usr/lib32 /usr/openwin/lib /usr/X11R6/lib64 /usr/lib"
  fi
  for I in $_x11_paths ; do
    _ld_x11="-L$I -lXext -lX11 $_ld_sock $_ld_pthread"
    if netbsd; then
      _ld_x11="$_ld_x11 -Wl,-R$I"
    fi
    if test -d "$I" && cc_check $_inc_x11 $_ld_x11 ; then

int main(void) { 
  (void) XvMCQueryExtension(0,0,0);
  (void) XvMCCreateContext(0,0,0,0,0,0,0);
  return 0; }
EOF
  for _ld_tmp in $_xvmclib XvMCNVIDIA XvMCW I810XvMC ; do
    cc_check $_inc_x11 -lXvMC -l$_ld_tmp $_ld_xv $_ld_x11 && _xvmc=yes && _xvmclib="$_ld_tmp" && break
  done
fi
if test "$_xvmc" = yes ; then
  _def_xvmc='#define HAVE_XVMC 1'
  _ld_xvmc="-lXvMC -l$_xvmclib"
  _vosrc="$_vosrc vo_xvmc.c"
  _vomodules="xvmc $_vomodules"
  _res_comment="using $_xvmclib"
else
  _def_xvmc='#undef HAVE_XVMC'
  _novomodules="xvmc $_novomodules"
fi
echores "$_xvmc"

18978:9f97ca988ea7

  --with-toolamedir=DIR    path to Toolame library and include file
  --with-xmmsplugindir=DIR XMMS plugins in DIR
  --with-xmmslibdir=DIR    libxmms.so.1 in DIR
  --with-cdparanoiaincdir=DIR  cdparanoia headers in DIR (*)
  --with-cdparanoialibdir=DIR  cdparanoia libraries (libcdda_*) in DIR (*)
  --with-xvmclibdir=NAME   name of adapter-specific library (e.g. XvMCNVIDIA)
  --with-termcaplib=NAME   name of library with termcap functionality
                           name should be given without leading "lib"
                           checks for "termcap" and "tinfo"
  
  --with-freetype-config=PATH path to freetype-config

  --with-x11incdir=*)
    _inc_x11=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
    ;;
  --with-x11libdir=*)
    _x11libdir=`echo $ac_option | cut -d '=' -f 2`
    ;;
  --with-dxr2incdir=*)
    _inc_dxr2=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
    ;;
  --with-xvmclibdir=*)
    _xvmclibdir=`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=*)

  cat > $TMPC <<EOF
#include <X11/Xlib.h>
#include <X11/Xutil.h>
int main(void) { (void) XCreateWindow(0,0,0,0,0,0,0,0,0,0,0,0); return 0; }
EOF
  if test -z "$_x11libdir" ; then
    _x11libdir="/usr/X11R6/lib /usr/lib/X11R6 /usr/X11/lib /usr/lib32 /usr/openwin/lib /usr/X11R6/lib64 /usr/lib"
  fi
  for I in $_x11libdir ; do
    _ld_x11="-L$I -lXext -lX11 $_ld_sock $_ld_pthread"
    if netbsd; then
      _ld_x11="$_ld_x11 -Wl,-R$I"
    fi
    if test -d "$I" && cc_check $_inc_x11 $_ld_x11 ; then

int main(void) { 
  (void) XvMCQueryExtension(0,0,0);
  (void) XvMCCreateContext(0,0,0,0,0,0,0);
  return 0; }
EOF
  for _ld_tmp in $_xvmclibdir XvMCNVIDIA XvMCW I810XvMC ; do
    cc_check $_inc_x11 -lXvMC -l$_ld_tmp $_ld_xv $_ld_x11 && _xvmc=yes && _xvmclibdir="$_ld_tmp" && break
  done
fi
if test "$_xvmc" = yes ; then
  _def_xvmc='#define HAVE_XVMC 1'
  _ld_xvmc="-lXvMC -l$_xvmclibdir"
  _vosrc="$_vosrc vo_xvmc.c"
  _vomodules="xvmc $_vomodules"
  _res_comment="using $_xvmclibdir"
else
  _def_xvmc='#undef HAVE_XVMC'
  _novomodules="xvmc $_novomodules"
fi
echores "$_xvmc"