[Mplayer-cvslog] CVS: main configure,1.250,1.251

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv29858

Modified Files:
	configure 
Log Message:
better dl handling and initial QNX support

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- configure	16 Nov 2001 18:40:27 -0000	1.250
+++ configure	18 Nov 2001 14:34:00 -0000	1.251
@@ -5,6 +5,10 @@
 #				   pontscho at makacs.poliod.hu
 #
 # Changes in reversed order:
+# 2001/11/18 by alex
+# - initial QNX support
+# - better dl handling
+#
 # 2001/11/15 by Gabucino
 # - optional linking parameters for static linking
 #
@@ -148,6 +152,7 @@
 bsdos()   { test "$system_name" = "BSD/OS"  ; return "$?" ; }
 openbsd() { test "$system_name" = "OpenBSD" ; return "$?" ; }
 bsd()     { freebsd || netbsd || bsdos || openbsd ; return "$?" ; }
+qnx()     { test "$system_name" = "QNX"     ; return "$?" ; }
 
 
 # Check how echo works in this /bin/sh
@@ -352,7 +357,7 @@
    # OS name
    system_name=`( uname -s ) 2>&1`
    case "$system_name" in
-   Linux|FreeBSD|NetBSD|BSD/OS|OpenBSD|SunOS)
+   Linux|FreeBSD|NetBSD|BSD/OS|OpenBSD|SunOS|QNX)
       : # well-known OSes
       ;;
    IRIX*)
@@ -384,6 +389,8 @@
        case "`uname -m 2>&1`" in
        i[3-9]86)
            host_arch=i386;;
+       x86*)			# used by QNX
+           host_arch=i386;;
        ppc)
            host_arch=ppc;;
        alpha)
@@ -412,6 +419,8 @@
     _confcygwin="TARGET_CYGWIN=yes"
     _confwin32="#define WIN32"
     _archlibs="-lpthread"
+elif qnx ; then
+    _archlibs="-pthread"
 else
     _archlibs="-ldl -lpthread"
 fi
@@ -937,7 +946,7 @@
 cc_check $_extraincdir $_extralibdir -lvgagl -lvga && _svga=yes
 
 # Checking for posix threads lib...
-if bsd ; then
+if bsd || qnx ; then
   cc_check -pthread || die "Lib pthread not found."
 else
   cc_check -lpthread || die "Lib pthread not found."
@@ -1245,7 +1254,13 @@
 int main( void ) {  return 0; }
 EOF
 _libdl=no
-cc_check -ldl && _libdl=yes
+if freebsd || qnx ; then
+ cc_check && _libdl=yes
+ _libdl_lib=""
+else
+ cc_check -ldl && _libdl=yes
+ _libdl_lib="-ldl"
+fi
 
 # check for zlib.h
 cat > $TMPC << EOF
@@ -1815,11 +1830,7 @@
 fi
 
 if test "$_xanim" = yes && test "$_libdl" = no ; then
- if freebsd ; then
-  _xanim=yes
- else
   _xanim=no
- fi
 fi
 
 # to screen.
@@ -1878,6 +1889,7 @@
 echo "Checking for DirectShow ... $_dshow"
 echo "Checking for iconv function ... $_iconv"
 echo "Checking for zlib ... $_zlib"
+echo "Checking for dl ... $_libdl"
 
 # check if compiler supports C++ and C++-libs are installed correctly
 if test "$_win32" = yes && test "$_dshow" = yes ; then
@@ -2613,7 +2625,7 @@
 
 X11_INC=$_x11incdir
 X11DIR=$_x11libdir
-X_LIBS=$_x11libdir $_extralibdir $_volib $_volibdir $_gllib $_ggilib $_dxr3lib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib $_libpng $_socklib $_aalib $_libvorbis $_xineramalib $_libmad $_zlib
+X_LIBS=$_x11libdir $_extralibdir $_volib $_volibdir $_gllib $_ggilib $_dxr3lib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib $_libpng $_socklib $_aalib $_libvorbis $_xineramalib $_libmad $_zlib $_libdl_lib
 VO_LIB=$_volib
 
 TERMCAP_LIB=$_libtermcap