* Bug fixes and enhancements in the Gtk+/Gnome interfaces.

[vlc] / configure.in

diff --git a/configure.in b/configure.in
index f0a6e599200b5f5826d914b5a68b591dc23e45d9..5d826eaf8759e3fd696b2eafe2e6bb58e21fbeaa 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_CONFIG_HEADER(include/defs.h)
 
 AC_CANONICAL_HOST
 
-VLC_VERSION=0.2.62
+VLC_VERSION=0.2.63
 AC_SUBST(VLC_VERSION)
 VLC_CODENAME=Urumov
 AC_SUBST(VLC_CODENAME)
@@ -123,6 +123,10 @@ AC_ARG_ENABLE(mmx,
 [  --disable-mmx           Disable MMX optimizations (default enabled for x86)],
 [ if test x$enableval = xyes; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}${ACCEL_PLUGINS}; fi ],
 [ if test x${host_cpu} = xi686 -o x${host_cpu} = xi586; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}${ACCEL_PLUGINS}; fi ])
+AC_ARG_ENABLE(css,
+[  --disable-css           Disable DVD CSS decryption (default enabled)],
+[ if test x$enableval = xyes; then CSS=1; else CSS=0; fi ], [ CSS=1; ])
+if test x${CSS} = x1; then AC_DEFINE(HAVE_CSS, 1, Define if you want DVD CSS decryption.) fi
 AC_ARG_ENABLE(debug,
 [  --enable-debug          Enable debug mode (default disabled)],
 [ if test x$enableval = xyes; then DEBUG=1; fi ])
@@ -144,7 +148,6 @@ dnl default case
 else
 
 GVLC=0
-KVLC=0
 
 AC_ARG_ENABLE(dummy,
   [  --disable-dummy         dummy module (default enabled)])
@@ -163,21 +166,27 @@ AC_ARG_ENABLE(fb,
   [if test x$enable_fb = xyes; then PLUGINS=${PLUGINS}"fb "; fi])
 AC_ARG_WITH(ggi,
   [  --with-ggi[=name]       GGI support (default disabled)],
-  [ PLUGINS=${PLUGINS}"ggi ";
-    if test "x$withval" != "xyes";
+  [ if test "x$withval" != "xno";
     then
-      LIB_GGI="-l"$withval
-    else
-      LIB_GGI="-lggi"
+      PLUGINS=${PLUGINS}"ggi ";
+      if test "x$withval" != "xyes";
+      then
+        LIB_GGI="-l"$withval
+      else
+        LIB_GGI="-lggi"
+      fi
     fi ])
 AC_ARG_WITH(sdl,
   [  --with-sdl[=name]       SDL support (default enabled)],
-  [ PLUGINS=${PLUGINS}"sdl ";
-    if test "x$withval" != "xyes";
+  [ if test "x$withval" != "xno";
     then
-      LIB_SDL="L/usr/X11R6/lib -l"$withval
-    else
-      LIB_SDL="-L/usr/X11R6/lib -lSDL"
+      PLUGINS=${PLUGINS}"sdl ";
+      if test "x$withval" != "xyes";
+      then
+        LIB_SDL="L/usr/X11R6/lib -l"$withval
+      else
+        LIB_SDL="-L/usr/X11R6/lib -lSDL"
+      fi
     fi ])
     if test "x$withval" = "x";
     then
@@ -186,19 +195,25 @@ AC_ARG_WITH(sdl,
     fi
 AC_ARG_WITH(glide,
   [  --with-glide[=name]     Glide (3dfx) support (default disabled)],
-  [ PLUGINS=${PLUGINS}"glide ";
-    if test "x$withval" != "xyes";
+  [ if test "x$withval" != "xno";
     then
-      LIB_GLIDE="-l"$withval
-    else
-      LIB_GLIDE="-lglide2x"
+      PLUGINS=${PLUGINS}"glide ";
+      if test "x$withval" != "xyes";
+      then
+        LIB_GLIDE="-l"$withval
+      else
+        LIB_GLIDE="-lglide2x"
+      fi
     fi ])
 AC_ARG_ENABLE(ncurses,
   [  --enable-ncurses        ncurses interface support (default disabled)],
   [if test x$enable_ncurses = xyes; then PLUGINS=${PLUGINS}"ncurses "; fi])
+AC_ARG_ENABLE(qt,
+  [  --enable-qt             Qt interface support (default disabled)],
+  [if test x$enable_qt = xyes; then PLUGINS=${PLUGINS}"qt "; ALIASES=${ALIASES}"qvlc "; fi])
 AC_ARG_ENABLE(kde,
   [  --enable-kde            KDE interface support (default disabled)],
-  [if test x$enable_kde = xyes; then PLUGINS=${PLUGINS}"kde "; KVLC=1; fi])
+  [if test x$enable_kde = xyes; then PLUGINS=${PLUGINS}"kde "; ALIASES=${ALIASES}"kvlc "; fi])
 AC_ARG_ENABLE(gnome,
   [  --enable-gnome          Gnome interface support (default disabled)],
   [if test x$enable_gnome = xyes; then PLUGINS=${PLUGINS}"gnome "; GVLC=1; fi])
@@ -214,7 +229,6 @@ AC_ARG_ENABLE(alsa,
   [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 $have_alsa = true; then PLUGINS=${PLUGINS}"alsa "; fi; fi])
 
 if test x$GVLC = x1 ; then ALIASES=${ALIASES}"gvlc "; fi
-if test x$KVLC = x1 ; then ALIASES=${ALIASES}"kvlc "; fi
 
 fi
 
@@ -225,6 +239,7 @@ AC_SUBST(ALIASES)
 AC_SUBST(DEBUG)
 AC_SUBST(STATS)
 AC_SUBST(OPTIMS)
+AC_SUBST(CSS)
 AC_SUBST(DYNAMIC_FLAG)
 AC_SUBST(LIB_SDL)
 AC_SUBST(LIB_GLIDE)
@@ -241,6 +256,7 @@ architecture          : ${ARCH}
 debug mode            : ${DEBUG}
 statistics            : ${STATS}
 optimizations         : ${OPTIMS}
+CSS decryption        : ${CSS}
 plugins               : ${PLUGINS}
 vlc aliases           : ${ALIASES}
 "