Reenable dvdcss which was disabled accidently in [16806]. Fix the dvdnav patch to...

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6fbf3fa9bc518958ba52e29abdab983007e4b95a..3b0e59b90533233ec5ba5ab38885f1f884506701 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1572,7 +1572,6 @@ AS_IF([test "${enable_audioscrobbler}" != "no"], [
 dnl
 dnl Musicbrainz plugin
 dnl
-
 AC_ARG_ENABLE(musicbrainz,
   [  --enable-musicbrainz    MusicBrainz support (default disabled) ])
   AS_IF([test "${enable_musicbrainz}" = "yes"],[
@@ -1583,6 +1582,17 @@ AC_ARG_ENABLE(musicbrainz,
        [AC_MSG_WARN(MusicBrainz library not found)])
    ])
 
+dnl
+dnl Taglibplugin
+dnl
+AC_ARG_ENABLE(taglib,
+  [  --enable-taglib Taglib support (default disabled) ])
+  AS_IF([test "x${enable_taglib}" = "xyes"],[
+       VLC_ADD_PLUGINS([taglib])
+       VLC_ADD_LDFLAGS([taglib], [-ltag])
+       VLC_ADD_CXXFLAGS([taglib], [-I/usr/include/taglib])
+   ])
+
 dnl
 dnl  Input plugins
 dnl
@@ -4693,9 +4703,9 @@ then
   AC_PATH_PROG(WX_CONFIG, ${WXWIDGETS_NAME}, no, ${WXWIDGETS_PATH})
   if test "${WX_CONFIG}" != "no" -a "${CXX}" != ""
   then
-    if expr 2.3.0 \> `${WX_CONFIG} --version` >/dev/null
+    if expr 2.6.0 \> `${WX_CONFIG} --version` >/dev/null ||  expr 2.7.0 \<= `${WX_CONFIG} --version` >/dev/null
     then
-      AC_MSG_ERROR([Your development package for wxWidgets is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-wxwidgets.])
+      AC_MSG_ERROR([You need wxWidgets of the 2.6 branch. Please upgrade and try again. Alternatively you can also configure with --disable-wxwidgets.])
     fi
     AC_LANG_PUSH(C++)
     # Turn this error:
@@ -5085,30 +5095,6 @@ then
 fi
 
 
-dnl
-dnl corba (ORBit) plugin
-dnl
-dnl Default: do not enable corba
-enablecorba=false
-AC_ARG_ENABLE(corba,
-  [  --enable-corba          corba interface support (default disabled)])
-if test "${enable_corba}" = "yes"; then
-      GLIB_VERSION=2.3.2
-      PKG_CHECK_MODULES(CORBA, 
-       ORBit-2.0 >= 2.8.0 \
-       glib-2.0 >= $GLIB_VERSION \
-       gobject-2.0 >= $GLIB_VERSION \
-       gthread-2.0 >= $GLIB_VERSION,
-       [
-         enablecorba=true
-         VLC_ADD_LDFLAGS([corba],[$CORBA_LIBS])
-         VLC_ADD_CFLAGS([corba],[$CORBA_CFLAGS])
-          VLC_ADD_PLUGINS([corba snapshot]) ],
-        [ enablecorba=false
-         AC_MSG_WARN(corba library not found) ])
-fi
-AM_CONDITIONAL(ENABLE_CORBA, test "$enablecorba" = "true")
-
 AC_ARG_WITH(,[Misc options:])
 
 dnl
@@ -5370,10 +5356,10 @@ AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
 dnl
 dnl  Mediacontrol Python bindings
 dnl
-AC_ARG_ENABLE(mediacontrol-python-bindings,
-  [  --enable-mediacontrol-python-bindings    Enable Python bindings for MediaControl (default disabled)])
+AC_ARG_ENABLE(python-bindings,
+  [  --enable-python-bindings    Enable Python bindings (default disabled)])
 dnl TODO: look for python dev headers
-AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_mediacontrol_python_bindings}" = "yes"])
+AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"])
 
 dnl
 dnl  Java bindings
@@ -5607,7 +5593,7 @@ AC_CONFIG_FILES([
   bindings/Makefile
   bindings/java/Makefile
   bindings/java/src/Makefile
-  bindings/mediacontrol-python/Makefile
+  bindings/python/Makefile
   doc/Makefile
   intl/Makefile
   ipkg/Makefile
@@ -5645,14 +5631,12 @@ AC_CONFIG_FILES([
   modules/codec/spudec/Makefile
   modules/control/Makefile
   modules/control/http/Makefile
-  modules/control/corba/Makefile
   modules/demux/Makefile
   modules/demux/asf/Makefile
   modules/demux/avi/Makefile
   modules/demux/mp4/Makefile
   modules/demux/mpeg/Makefile
   modules/demux/playlist/Makefile
-  modules/demux/util/Makefile
   modules/gui/Makefile
   modules/gui/beos/Makefile
   modules/gui/pda/Makefile