Commit 2005c7dd authored by Brad Smith's avatar Brad Smith Committed by Rémi Denis-Courmont

Fix up *BSD handling in Operating System check (for 2.0)

This fixes up the *BSD handling within the Operating System check.
SYS is now set to the OS without the version attached as provided
by ${host_os} (.e.g. openbsd instead of openbsd5.1) to match all
the other OS's and simplifies other OS's checks further down. This
also allows the script to recognize DragonFly.

This is back porting 4bee377f to 2.0.

There was a typo with the initial patch.
Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent 22220ec5
......@@ -112,23 +112,26 @@ case "${host_os}" in
CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
VLC_ADD_LIBS([vcd cdda vcdx],[-ldvd])
;;
*bsd*)
SYS="${host_os}"
freebsd*)
SYS=freebsd
CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
case "${host_os}" in
freebsd*)
CPPFLAGS_save="${CPPFLAGS_save} -I/usr/local/include"
CPPFLAGS="${CPPFLAGS_save}"
LDFLAGS_save="${LDFLAGS_save} -L/usr/local/lib"
LDFLAGS="${LDFLAGS_save}"
;;
openbsd*)
CPPFLAGS_save="${CPPFLAGS_save} -I/usr/local/include -I/usr/X11R6/include"
CPPFLAGS="${CPPFLAGS_save}"
LDFLAGS_save="${LDFLAGS_save} -L/usr/local/lib -L/usr/X11R6/lib/"
LDFLAGS="${LDFLAGS_save}"
;;
esac
CPPFLAGS_save="${CPPFLAGS_save} -I/usr/local/include"
CPPFLAGS="${CPPFLAGS_save}"
LDFLAGS_save="${LDFLAGS_save} -L/usr/local/lib"
LDFLAGS="${LDFLAGS_save}"
;;
openbsd*)
SYS=openbsd
CPPFLAGS_save="${CPPFLAGS_save} -I/usr/local/include -I/usr/X11R6/include"
CPPFLAGS="${CPPFLAGS_save}"
LDFLAGS_save="${LDFLAGS_save} -L/usr/local/lib -L/usr/X11R6/lib/"
LDFLAGS="${LDFLAGS_save}"
;;
netbsd*)
SYS=netbsd
;;
dragonfly*)
SYS=dragonfly
;;
darwin*)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment