* Updated version numbers for imminent release.

[vlc] / configure.in

diff --git a/configure.in b/configure.in
index 4ffc0aa8b86c5fb615cfbf3ff1d27ca6d6305c71..1c0ba32a22527eca516db9d19012814989171357 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,12 +1,12 @@
-dnl Autoconf settings for vlc
+dnl Autoconf settings for vlc and libdvdcss
 AC_INIT(include/main.h)
 AC_CONFIG_HEADER(include/defs.h)
 
 AC_CANONICAL_HOST
 
-VLC_VERSION=0.2.80
+VLC_VERSION=0.2.81
 AC_SUBST(VLC_VERSION)
-LIBDVDCSS_VERSION=0.0.1
+LIBDVDCSS_VERSION=0.0.2
 AC_SUBST(LIBDVDCSS_VERSION)
 VLC_CODENAME=Ourumov
 AC_SUBST(VLC_CODENAME)
@@ -322,10 +322,22 @@ dnl
 LOCAL_LIBDVDCSS=0
 STATIC_LIBDVDCSS=0
 AC_ARG_WITH(dvdcss,
-  [  --with-dvdcss[=name]    use another libdvdcss (default is local one)],
-  [ if test "x$withval" == "xno"
-    then
-      # local libdvdcss
+  [  --with-dvdcss[=name]    way to use libdvdcss, either local-static, local-shared or a path to another libdvdcss such as /usr/local (default local-static)],
+  [ case "x${withval}" in
+    xlocal-static|xyes)
+      # local libdvdcss, statically linked
+      if test x${CAN_BUILD_LIBDVDCSS} = x1
+      then
+        LOCAL_LIBDVDCSS=1
+        STATIC_LIBDVDCSS=1
+        BUILTINS="${BUILTINS} dvd"
+        CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
+        LIB_DVD="${LIB_DVD} lib/libdvdcss.a"
+        LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a"
+      fi
+    ;;
+    xlocal-shared)
+      # local libdvdcss, dynamically linked
       if test x${CAN_BUILD_LIBDVDCSS} = x1
       then
         LOCAL_LIBDVDCSS=1
@@ -334,7 +346,8 @@ AC_ARG_WITH(dvdcss,
         LIB_DVD="${LIB_DVD} -Llib -ldvdcss"
         LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -L../../lib -ldvdcss"
       fi
-    else
+    ;;
+    *)
       # existing libdvdcss
       BUILTINS="${BUILTINS} dvd"
       if test "x$withval" != "xyes"
@@ -344,7 +357,7 @@ AC_ARG_WITH(dvdcss,
       fi
       LIB_DVD="${LIB_DVD} -ldvdcss"
       LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldvdcss"
-    fi ],
+    esac ],
   # user didn't decide, we choose to use local libdvdcss and link statically
   [ if test x${CAN_BUILD_LIBDVDCSS} = x1
     then
@@ -704,10 +717,15 @@ dnl  ALSA module
 dnl
 AC_ARG_ENABLE(alsa,
   [  --enable-alsa           Alsa sound drivers support (Only for linux) (default disabled)],
-  [if test x$enable_alsa = xyes; then AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") if test x$have_alsa = xtrue; then
-     PLUGINS="${PLUGINS} alsa"
-     LIB_ALSA="-lasound"
-   fi; fi])
+  [if test x$enable_alsa = xyes
+   then
+     AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false")
+     if test x$have_alsa = xtrue
+     then
+       PLUGINS="${PLUGINS} alsa"
+       LIB_ALSA="-lasound"
+     fi
+   fi])
 
 dnl  end of non-BeOS stuff
 fi