vlc | branch: master | Brad Smith <[email protected]> | Mon Jan 30 02:12:24
2012 -0500| [4bee377fec3a95fe6681b0af3517f38064c336f2] | committer: Rémi
Denis-Courmont
Fix up *BSD handling in Operating System check
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.
Signed-off-by: Rémi Denis-Courmont <[email protected]>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4bee377fec3a95fe6681b0af3517f38064c336f2
---
configure.ac | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index db47a2c..d21631e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,19 +108,22 @@ case "${host_os}" in
CFLAGS="${CFLAGS} -pthread"
VLC_ADD_LIBS([vcd cdda vcdx],[-ldvd])
;;
- *bsd*)
- SYS="${host_os}"
+ freebsd*)
+ SYS=freebsd
CFLAGS="${CFLAGS} -pthread"
- case "${host_os}" in
- freebsd*)
- CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
- LDFLAGS="${LDFLAGS} -L/usr/local/lib"
- ;;
- openbsd*)
- CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/usr/X11R6/include"
- LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib/"
- ;;
- esac
+ CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
+ LDFLAGS="${LDFLAGS} -L/usr/local/lib"
+ ;;
+ openbsd*)
+ SYS=openbsd
+ CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/usr/X11R6/include"
+ LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib/"
+ ;;
+ netbsd*)
+ SYS=netbsd
+ ;;
+ dragonfly*)
+ SYS=dragonfly
;;
darwin*)
_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits
