comparison configure @ 3506:3d906972dafd

--with-x11{inc,lib}dir configure option broken, can't select a specific X11 include/lib directory for mplayer compilation solaris has pthread stub routines in libc, try to verify that the _ld_pthread option used really produces a working threaded binary.

3505:f35c03c967a3

echocheck "pthread"
cat > $TMPC << EOF
#include <pthread.h>
int main(void) { (void) pthread_create (0, 0, 0, 0); return 0; }
EOF
if cc_check ; then              # QNX
  _ld_pthread=''
elif cc_check -lpthread ; then
  _ld_pthread='-lpthread'
elif cc_check -pthread ; then
  _ld_pthread='-pthread'
else
  die "Lib pthread not found. (needed by windows and networking stuff)"
fi
echores "yes (using $_ld_pthread)"

fi
echores "$_vsscanf"


echocheck "X11 headers"
if test -z "$_x11incdir" ; then
  for I in /usr/include /usr/X11R6/include /usr/X11/include /usr/openwin/include ; do
    if test -d "$I/X11" ; then
      _x11incdir="$I"
      echores "yes (found: $I)"
      break
    fi
  done
fi
if test -z "$_x11incdir" ; then
  _x11=no
  echores "not found"
elif test "$_x11incdir" != "/usr/include" ; then
  _inc_x11="-I$_x11incdir"
fi


echocheck "X11 libs"
if test -z "$_x11libdir" ; then
  for I in /usr/X11R6/lib /usr/X11/lib /usr/lib32 /usr/openwin/lib ; do
    if test -d "$I" ; then
      _x11libdir="$I"
      echores "yes (found: $I)"
      break;
    fi
  done
fi
if test -z "$_x11libdir" ; then
  _x11=no
  echores "not found"
fi
_ld_x11="-L$_x11libdir -lX11 -lXext $_ld_sock"


#########
# VIDEO #
#########

  cat > $TMPC << EOF
#include <audio/audiolib.h>
int main(void) { return 0; }
EOF
  _nas=no
  cc_check -laudio -lX11 -lXt -lm -I$_x11incdir -L$_x11libdir && _nas=yes
fi
if test "$_nas" = yes ; then
  _def_nas='#define HAVE_NAS 1'
  _ld_nas="-laudio -lX11 -lXt -L$_x11libdir"
  _aosrc="$_aosrc ao_nas.c"
  _aomodules="nas $_aomodules"
else
  _def_nas='#undef HAVE_NAS'
fi

3506:3d906972dafd

echocheck "pthread"
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
if ( cc_check && $TMPO ) ; then              # QNX
  _ld_pthread=''
elif ( cc_check -lpthread && $TMPO ) ; then
  _ld_pthread='-lpthread'
elif ( cc_check -pthread && $TMPO ) ; then
  _ld_pthread='-pthread'
else
  die "Lib pthread not found. (needed by windows and networking stuff)"
fi
echores "yes (using $_ld_pthread)"

fi
echores "$_vsscanf"


echocheck "X11 headers"
if test -z "$_inc_x11" ; then
  for I in /usr/include /usr/X11R6/include /usr/X11/include /usr/openwin/include ; do
    if test -d "$I/X11" ; then
      _inc_x11="-I$I"
      echores "yes (found: $I)"
      break
    fi
  done
  if test -z "$_inc_x11" ; then
    _x11=no
    echores "not found"
  fi
else
  echores "yes (use: $_inc_x11)"
fi
if test "$_inc_x11" = "-I/usr/include" ; then
  _inc_x11=""
fi


echocheck "X11 libs"
if test -z "$_ld_x11" ; then
  for I in /usr/X11R6/lib /usr/X11/lib /usr/lib32 /usr/openwin/lib ; do
    if test -d "$I" ; then
      _ld_x11="-L$I"
      echores "yes (found: $I)"
      break;
    fi
  done
  if test -z "$_ld_x11" ; then
    _x11=no
    echores "not found"
  fi
else
  echores "yes (use: $_ld_x11)"
fi
_ld_x11="$_ld_x11 -lX11 -lXext $_ld_sock"


#########
# VIDEO #
#########

  cat > $TMPC << EOF
#include <audio/audiolib.h>
int main(void) { return 0; }
EOF
  _nas=no
  cc_check -laudio $_inc_x11 $_ld_x11 -lXt -lm && _nas=yes
fi
if test "$_nas" = yes ; then
  _def_nas='#define HAVE_NAS 1'
  _ld_nas="-laudio  $_ld_x11 -lXt"
  _aosrc="$_aosrc ao_nas.c"
  _aomodules="nas $_aomodules"
else
  _def_nas='#undef HAVE_NAS'
fi