src/control/core.c: prepend a dummy argv[0] to libvlc_new() argv, so

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9bf8fb1d4c1a5d2a0c2abb483200ac5e06240941..57a44ce8561d9d06dd3294463f20ab0482f8ce92 100644 (file)
--- 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,18 +1572,26 @@ AS_IF([test "${enable_audioscrobbler}" != "no"], [
 dnl
 dnl Musicbrainz plugin
 dnl
-
-enablemusicbrainz=false
 AC_ARG_ENABLE(musicbrainz,
-  [  --enable-musicbrainz    MusicBrainz support (default disabled) ],
-  [if test "${enable_musicbrainz}" = "yes"; then
-      PKG_CHECK_MODULES(MusicBrainz, QtCore QtGui,
+  [  --enable-musicbrainz    MusicBrainz support (default disabled) ])
+  AS_IF([test "${enable_musicbrainz}" = "yes"],[
+      PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz,
        [ VLC_ADD_PLUGINS([musicbrainz])
-         enablemusicbrainz=true
-         VLC_ADD_LDFLAGS([musicbrainz],[-lmusicbrainz]) ],
+         VLC_ADD_LDFLAGS([musicbrainz],[$MUSICBRAINZ_LIBS]) 
+         VLC_ADD_CFLAGS([musicbrainz],[$MUSICBRAINZ_CFLAGS])  ],
        [AC_MSG_WARN(MusicBrainz library not found)])
-   fi])
-AM_CONDITIONAL(ENABLE_MUSICBRAINZ, test "$enableqt4" = "true")
+   ])
+
+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
@@ -1598,13 +1606,13 @@ then
   AC_MSG_WARN(--{en|dis}able-livedotcom is deprecated. Use --{en|dis}able-live555 instead.)
 fi
 
-if test "${enable_livedotcom}" = "yes"
+if test "${enable_livedotcom}" = "no"
 then
-  enable_live555="yes"
+  enable_live555="no"
 fi
 AC_ARG_ENABLE(live555,
-[  --enable-live555        live555 RTSP input plugin (default disabled)])
-if test "${enable_live555}" = "yes"; then
+[  --enable-live555        live555 RTSP input plugin (default enabled)])
+if test "${enable_live555}" != "no"; then
   AC_ARG_WITH(live555-tree,
     [    --with-live555-tree=PATH live.com tree for static linking])
 
@@ -1677,8 +1685,10 @@ if test "${enable_live555}" = "yes"; then
       fi
     else
       dnl  The given live555 wasn't built
-      AC_MSG_RESULT(no)
-      AC_MSG_ERROR([cannot find ${real_live555_tree}/liveMedia/libliveMedia.a, make sure you compiled live555 in ${with_live555_tree}])
+        AC_MSG_RESULT(no)
+      if test "${enable_live555}" = "yes"; then
+        AC_MSG_ERROR([cannot find ${real_live555_tree}/liveMedia/libliveMedia.a, make sure you compiled live555 in ${with_live555_tree}])
+      fi       
     fi
   fi
 fi
@@ -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
@@ -5662,6 +5646,7 @@ AC_CONFIG_FILES([
   modules/gui/skins2/Makefile
   modules/gui/wxwidgets/Makefile
   modules/gui/wince/Makefile
+  modules/meta_engine/Makefile
   modules/misc/Makefile
   modules/misc/dummy/Makefile
   modules/misc/memcpy/Makefile