Changeset 91a4847521643cd0fb8ce26f7ed022b5e2f56f81

Timestamp:

07/02/08 18:17:01 (2 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1215015421 +0300

git-parent:

[8b9b6da88e06749994e79e906faa7195c1fcae56]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1215015377 +0300

Message:

VLM: build if ENABLE_VLM rather than ENABLE_SOUT

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (4 diffs)
• src/input/vlm.c (modified) (2 diffs)

configure.ac

@@ -1696 +1696 @@
-  VLC_ADD_PLUGIN([telnet])
-])
+AM_CONDITIONAL([ENABLE_VLM], [test "${enable_vlm}" != "no"])
-
-dnl

src/Makefile.am

@@ -202 +202 @@
-    $(SOURCES_libvlc_getopt) \
-    $(SOURCES_libvlc_sout) \
+    $(SOURCES_libvlc_vlm) \
-    $(NULL)
-if HAVE_BEOS
@@ -232 +233 @@
-if ENABLE_SOUT
-libvlccore_la_SOURCES += $(SOURCES_libvlc_sout)
+if ENABLE_VLM
+libvlccore_la_SOURCES += $(SOURCES_libvlc_vlm)
+endif
-endif
-
@@ -366 +370 @@
-
-SOURCES_libvlc_sout = \
-    input/vlm.c \
-    input/vlmshell.c \
-    stream_output/stream_output.c \
-    stream_output/stream_output.h \
@@ -374 +376 @@
-    stream_output/sap.c \
-    stream_output/sdp.c \
+    $(NULL)
+
+SOURCES_libvlc_vlm = \
+    input/vlm.c \
+    input/vlmshell.c \
-    $(NULL)
-

src/input/vlm.c

@@ -39 +39 @@
-#include <vlc_vlm.h>
-
-#ifdef ENABLE_VLM
-
-#ifndef WIN32
-#   include <sys/time.h>                                   /* gettimeofday() */
@@ -1139 +1137 @@
-    return i_result;
-}
-
-#else /* ENABLE_VLM */
-
-/* We just define an empty wrapper */
-vlm_t *__vlm_New( vlc_object_t *a )
-{
-    msg_Err( a, "VideoLAN manager support is disabled" );
-    return NULL;
-}
-
-void vlm_Delete( vlm_t *a )
-{
-    (void)a;
-}
-
-int vlm_ExecuteCommand( vlm_t *a, const char *b, vlm_message_t **c )
-{
-    abort();
-}
-
-vlm_message_t *vlm_MessageNew( const char *psz_name,
-                               const char *psz_format, ... )
-{
-    (void)psz_name; (void)psz_format;
-    return NULL;
-}
-
-vlm_message_t *vlm_MessageAdd( vlm_message_t *p_message,
-                               vlm_message_t *p_child )
-{
-    abort();
-}
-
-void vlm_MessageDelete( vlm_message_t *a )
-{
-    (void)a;
-}
-
-int vlm_Control( vlm_t *p_vlm, int i_query, ... )
-{
-    (void)p_vlm; (void)i_query;
-    return VLC_EGENERIC;
-}
-
-#endif /* ENABLE_VLM */