comparison configure @ 19433:e1ec9b9bf6f7

Some more consistency for the conditions under which tests are run.

19432:2052a90d9c29

_inet6=auto
_gethostbyname2=auto
_ftp=yes
_musepack=auto
_vstream=auto
_pthreads=yes
_ass=auto
_rpath=no
_asmalign_pot=auto
for ac_option do
  case "$ac_option" in

  fi
  echores "$_use_aton"
fi

_def_use_aton='#undef USE_ATON'
if test "$_use_aton" != no; then
  _def_use_aton='#define USE_ATON 1'
fi


echocheck "inttypes.h (required)"

#echores "using $_ld_dl_dynamic"

_def_threads='#undef HAVE_THREADS'

echocheck "pthread"
if test "$_pthreads" != no ; then
cat > $TMPC << EOF
#include <pthread.h>
void* func(void *arg) { return arg; }
int main(void) { pthread_t tid; return pthread_create (&tid, 0, func, 0) == 0 ? 0 : 1; }
EOF

  echores "no"
fi


echocheck "Xv"
if test "$_x11" = yes && test "$_xv" != no ; then
  cat > $TMPC <<EOF
#include <X11/Xlib.h>
#include <X11/extensions/Xvlib.h>
int main(void) {
  (void) XvGetPortAttribute(0, 0, 0, 0);

fi
echores "$_xvmc"


echocheck "Xinerama"
if test "$_x11" = yes && test "$_xinerama" != no ; then
  cat > $TMPC <<EOF
#include <X11/Xlib.h>
#include <X11/extensions/Xinerama.h>
int main(void) { (void) XineramaIsActive(0); return 0; }
EOF

if x86 && not qnx; then

if test "$_win32" != no ; then
    if test -z "$_win32libdir" ; then
      for I in "$_libdir/codecs" "$_libdir/win32" /usr/local/lib/codecs /usr/lib/codecs /usr/local/lib/win32 /usr/lib/win32 ; do
        if test -d "$I" ; then
          _win32libdir="$I"
          break;

  cc_check $_ld_lm "$_ld_xvid" && _xvidcompat=yes
  echores "$_xvidcompat"
fi

echocheck "x264"
cat > $TMPC << EOF
#include <inttypes.h>
#include <x264.h>
#if X264_BUILD < 48
#error We do not support old versions of x264. Get the latest from SVN.
#endif
int main(void) { x264_encoder_open((void*)0); return 0; }
EOF
_ld_x264="$_ld_x264 -lx264 $_ld_pthread"
if test "$_x264" != no ; then 
  _x264=no
  if cc_check $_ld_x264 $_ld_lm ; then 
    _x264=yes
  elif  test "$_x11" = yes && cc_check $_ld_x264 $_ld_x11 $_ld_lm ; then
    _x264=yes

echores "$_select"


echocheck "network"
# FIXME network check
if test "$_network" != no ; then
  _def_network='#define MPLAYER_NETWORK 1'
  _ld_network="$_ld_sock"
  _inputmodules="network $_inputmodules"
else
  _noinputmodules="network $_noinputmodules"

  _ftp=no
fi
echores "$_network"

echocheck "ftp"
if not beos && test "$_ftp" != no ; then
  _def_ftp='#define HAVE_FTP 1'
  _inputmodules="ftp $_inputmodules"
else
  _noinputmodules="ftp $_noinputmodules"
  _def_ftp='#undef HAVE_FTP'

19433:e1ec9b9bf6f7

_inet6=auto
_gethostbyname2=auto
_ftp=yes
_musepack=auto
_vstream=auto
_pthreads=auto
_ass=auto
_rpath=no
_asmalign_pot=auto
for ac_option do
  case "$ac_option" in

  fi
  echores "$_use_aton"
fi

_def_use_aton='#undef USE_ATON'
if test "$_use_aton" = yes; then
  _def_use_aton='#define USE_ATON 1'
fi


echocheck "inttypes.h (required)"

#echores "using $_ld_dl_dynamic"

_def_threads='#undef HAVE_THREADS'

echocheck "pthread"
if test "$_pthreads" = auto ; then
cat > $TMPC << EOF
#include <pthread.h>
void* func(void *arg) { return arg; }
int main(void) { pthread_t tid; return pthread_create (&tid, 0, func, 0) == 0 ? 0 : 1; }
EOF

  echores "no"
fi


echocheck "Xv"
if test "$_x11" = yes && test "$_xv" = auto ; then
  cat > $TMPC <<EOF
#include <X11/Xlib.h>
#include <X11/extensions/Xvlib.h>
int main(void) {
  (void) XvGetPortAttribute(0, 0, 0, 0);

fi
echores "$_xvmc"


echocheck "Xinerama"
if test "$_x11" = yes && test "$_xinerama" = auto ; then
  cat > $TMPC <<EOF
#include <X11/Xlib.h>
#include <X11/extensions/Xinerama.h>
int main(void) { (void) XineramaIsActive(0); return 0; }
EOF

if x86 && not qnx; then

if test "$_win32" = auto ; then
    if test -z "$_win32libdir" ; then
      for I in "$_libdir/codecs" "$_libdir/win32" /usr/local/lib/codecs /usr/lib/codecs /usr/local/lib/win32 /usr/lib/win32 ; do
        if test -d "$I" ; then
          _win32libdir="$I"
          break;

  cc_check $_ld_lm "$_ld_xvid" && _xvidcompat=yes
  echores "$_xvidcompat"
fi

echocheck "x264"
if test "$_x264" = auto ; then
  cat > $TMPC << EOF
#include <inttypes.h>
#include <x264.h>
#if X264_BUILD < 48
#error We do not support old versions of x264. Get the latest from SVN.
#endif
int main(void) { x264_encoder_open((void*)0); return 0; }
EOF
  _ld_x264="$_ld_x264 -lx264 $_ld_pthread"
  _x264=no
  if cc_check $_ld_x264 $_ld_lm ; then 
    _x264=yes
  elif  test "$_x11" = yes && cc_check $_ld_x264 $_ld_x11 $_ld_lm ; then
    _x264=yes

echores "$_select"


echocheck "network"
# FIXME network check
if test "$_network" = yes ; then
  _def_network='#define MPLAYER_NETWORK 1'
  _ld_network="$_ld_sock"
  _inputmodules="network $_inputmodules"
else
  _noinputmodules="network $_noinputmodules"

  _ftp=no
fi
echores "$_network"

echocheck "ftp"
if not beos && test "$_ftp" = yes ; then
  _def_ftp='#define HAVE_FTP 1'
  _inputmodules="ftp $_inputmodules"
else
  _noinputmodules="ftp $_noinputmodules"
  _def_ftp='#undef HAVE_FTP'