[vlc-commits] Fix up *BSD handling in Operating System check (for 2.0)

[Brad Smith]

vlc/vlc-2.0 | branch: master | Brad Smith <brad at comstyle.com> | Mon Jan 30 13:49:07 2012 -0500| [2005c7ddad80440aa943b6eb8b21d49aa9a68907] | committer: 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 4bee377fec3a95fe6681b0af3517f38064c336f2 to 2.0.

There was a typo with the initial patch.

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=2005c7ddad80440aa943b6eb8b21d49aa9a68907
---

 configure.ac |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5b67836..6111c3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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*)