summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-27 01:56:37 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-27 01:56:37 +0000
commit5a5acd6b1fdcffc96fbf25416f155cbf45b2fdaf (patch)
tree8ec8bfac51983ef7b52ce1109b51d90e290e2e6c /configure
parentc9bd9a617aa27da9350b8c3e1148074d9b2a5b2d (diff)
downloadmpv-5a5acd6b1fdcffc96fbf25416f155cbf45b2fdaf.tar.bz2
mpv-5a5acd6b1fdcffc96fbf25416f155cbf45b2fdaf.tar.xz
Remove bsd() system check. Lumping different *BSD systems together like
that was not a good idea in the first place. They are too different and constantly diverging. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26279 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure14
1 files changed, 7 insertions, 7 deletions
diff --git a/configure b/configure
index ed06223d84..05f91555ba 100755
--- a/configure
+++ b/configure
@@ -107,7 +107,6 @@ freebsd() { issystem "FreeBSD" || issystem "GNU/kFreeBSD"; return "$?" ; }
netbsd() { issystem "NetBSD" ; return "$?" ; }
bsdos() { issystem "BSD/OS" ; return "$?" ; }
openbsd() { issystem "OpenBSD" ; return "$?" ; }
-bsd() { freebsd || netbsd || bsdos || openbsd ; return "$?" ; }
qnx() { issystem "QNX" ; return "$?" ; }
darwin() { issystem "Darwin" ; return "$?" ; }
gnu() { issystem "GNU" ; return "$?" ; }
@@ -6812,7 +6811,7 @@ fi
echores "$_tv"
-if bsd; then
+if freebsd || netbsd || openbsd || bsdos ; then
echocheck "*BSD BT848 bt8xx header"
_ioctl_bt848_h=no
for file in "machine/ioctl_bt848.h" \
@@ -6900,7 +6899,7 @@ EOF
_noinputmodules="tv-bsdbt848 $_noinputmodules"
fi
echores "$_tv_bsdbt848"
-fi #if bsd
+fi #if freebsd || netbsd || openbsd || bsdos
echocheck "DirectShow TV interface"
@@ -7061,7 +7060,8 @@ else
fi
echores "$_radio_v4l"
-if bsd && test "$_radio" = yes && test "$_radio_bsdbt848" = auto ; then
+if freebsd || netbsd || openbsd || bsdos \
+ && test "$_radio" = yes && test "$_radio_bsdbt848" = auto ; then
echocheck "*BSD BrookTree 848 Radio interface"
_radio_bsdbt848=no
cat > $TMPC <<EOF
@@ -7077,7 +7077,7 @@ int main(void){
EOF
cc_check && _radio_bsdbt848=yes
echores "$_radio_bsdbt848"
-fi #if bsd && radio && radio_bsdbt848
+fi #if freebsd || netbsd || openbsd || bsdos && _radio && _radio_bsdbt848
if test "$_radio_bsdbt848" = yes ; then
_def_radio_bsdbt848='#define HAVE_RADIO_BSDBT848 1'
@@ -7449,7 +7449,7 @@ fi
# Dynamic linking flags
# (FIXME: 'echocheck "dynamic linking"' above and modify here accordingly)
_ld_dl_dynamic=''
-bsd && _ld_dl_dynamic='-rdynamic'
+freebsd || netbsd || openbsd || bsdos && _ld_dl_dynamic='-rdynamic'
if test "$_real" = yes || test "$_xanim" = yes && ! win32 && ! qnx && ! darwin && ! os2 ; then
_ld_dl_dynamic='-rdynamic'
fi
@@ -7573,7 +7573,7 @@ fi
# Thread support
if linux ; then
CFLAGS="$CFLAGS -D_REENTRANT"
-elif bsd ; then
+elif freebsd || netbsd || openbsd || bsdos ; then
# FIXME bsd needs this so maybe other OS'es
CFLAGS="$CFLAGS -D_THREAD_SAFE"
fi