X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=57a44ce8561d9d06dd3294463f20ab0482f8ce92;hb=24a43144ff5055f2a1b96f3d70a1f681583394bd;hp=fbea6f29a67f448096ae744efdb0ae4b3b21387c;hpb=2b7997ac9ae8ed9ac1c47f8a7e1ebcc45f2e3ab6;p=vlc

diff --git a/configure.ac b/configure.ac
index fbea6f29a6..57a44ce856 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1166,7 +1166,7 @@ VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
 if test "${SYS}" != "mingwce"; then
 dnl  VLC_ADD_PLUGINS([externrun])
   VLC_ADD_PLUGINS([access_fake access_filter_timeshift access_filter_record])
-  VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf time marq podcast shout sap fake])
+  VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf time marq podcast shout sap fake folder])
   VLC_ADD_PLUGINS([rss mosaic wall motiondetect clone crop])
   VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga])
   VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler])
@@ -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
@@ -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
@@ -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