Commit 44f318cb authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Makefile: remove --disable-httpd

Unlike, say stream output, the HTTP server has no hooks anywhere within
the rest of the core: it is used exclusively through calls from modules
to the LibVLC run-time.

Thus, if no modules use it, the code will be eliminated by linker (in
static builds) or not paged in (in dynamic builds). There is not much
point in adding a build-time option to turn it off. It only creates
problems with keeping missing.c in sync.
parent 92bf3acd
......@@ -1618,19 +1618,6 @@ fi
AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"])
dnl
dnl HTTP daemon
dnl
AC_ARG_ENABLE(httpd,
[AS_HELP_STRING([--disable-httpd],
[disable the built-in HTTP server (default enabled)])])
if test "${enable_httpd}" != "no"
then
AC_DEFINE(ENABLE_HTTPD, 1, Define if you want the HTTP daemon support)
fi
AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"])
dnl
dnl VideoLAN manager
dnl
......
......@@ -122,7 +122,9 @@ nobase_vlclib_DATA = \
lua/intf/dummy.luac \
lua/intf/dumpmeta.luac \
lua/intf/luac.luac \
lua/intf/http.luac \
lua/intf/modules/host.luac \
lua/intf/modules/httprequests.luac \
lua/intf/telnet.luac \
lua/meta/art/02_frenchtv.luac \
lua/meta/art/03_lastfm.luac \
......@@ -157,6 +159,7 @@ nobase_vlclib_DATA = \
nobase_doc_DATA = \
lua/README.txt \
lua/extensions/README.txt \
lua/http/requests/README.txt \
lua/intf/README.txt \
lua/intf/dumpmeta.lua \
lua/meta/README.txt \
......@@ -173,14 +176,66 @@ nobase_doc_DATA = \
lua/sd/icast.lua \
$(NULL)
if BUILD_HTTPD
nobase_vlclib_DATA += \
lua/intf/http.luac \
lua/intf/modules/httprequests.luac \
$(NULL)
nobase_vlcdata_DATA += $(DIST_http_lua)
nobase_doc_DATA += lua/http/requests/README.txt
endif
nobase_vlcdata_DATA += \
lua/http/view.html \
lua/http/mobile.html \
lua/http/dialogs/create_stream.html \
lua/http/dialogs/equalizer_window.html \
lua/http/dialogs/mosaic_window.html \
lua/http/dialogs/batch_window.html \
lua/http/dialogs/error_window.html \
lua/http/dialogs/browse_window.html \
lua/http/dialogs/stream_window.html \
lua/http/dialogs/offset_window.html \
lua/http/dialogs/stream_config_window.html \
lua/http/custom.lua \
lua/http/vlm.html \
lua/http/images/buttons.png \
lua/http/images/speaker-32.png \
lua/http/images/vlc-48.png \
lua/http/images/Audio-48.png \
lua/http/images/Folder-48.png \
lua/http/images/Other-48.png \
lua/http/images/Back-48.png \
lua/http/images/Video-48.png \
lua/http/images/vlc16x16.png \
lua/http/mobile_equalizer.html \
lua/http/vlm_export.html \
lua/http/mobile_browse.html \
lua/http/favicon.ico \
lua/http/mobile_view.html \
lua/http/requests/playlist.xml \
lua/http/requests/playlist.json \
lua/http/requests/README.txt \
lua/http/requests/playlist_jstree.xml \
lua/http/requests/browse.xml \
lua/http/requests/browse.json \
lua/http/requests/vlm_cmd.xml \
lua/http/requests/status.xml \
lua/http/requests/status.json \
lua/http/requests/vlm.xml \
lua/http/index.html \
lua/http/css/ui-lightness/jquery-ui-1.8.13.custom.css \
lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png \
lua/http/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png \
lua/http/css/ui-lightness/images/ui-icons_ffffff_256x240.png \
lua/http/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png \
lua/http/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png \
lua/http/css/ui-lightness/images/ui-icons_222222_256x240.png \
lua/http/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png \
lua/http/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png \
lua/http/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png \
lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png \
lua/http/css/ui-lightness/images/ui-icons_ffd27a_256x240.png \
lua/http/css/ui-lightness/images/ui-icons_228ef1_256x240.png \
lua/http/css/ui-lightness/images/ui-icons_ef8c08_256x240.png \
lua/http/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png \
lua/http/css/main.css \
lua/http/css/mobile.css \
lua/http/js/ui.js \
lua/http/js/common.js \
lua/http/js/jquery.jstree.js \
lua/http/js/controllers.js
endif
MOSTLYCLEANFILES += $(nobase_vlclib_DATA)
......@@ -242,68 +297,6 @@ EXTRA_DIST += \
lua/sd/icecast.lua \
lua/sd/icast.lua \
lua/sd/jamendo.lua
DIST_http_lua = \
lua/http/view.html \
lua/http/mobile.html \
lua/http/dialogs/create_stream.html \
lua/http/dialogs/equalizer_window.html \
lua/http/dialogs/mosaic_window.html \
lua/http/dialogs/batch_window.html \
lua/http/dialogs/error_window.html \
lua/http/dialogs/browse_window.html \
lua/http/dialogs/stream_window.html \
lua/http/dialogs/offset_window.html \
lua/http/dialogs/stream_config_window.html \
lua/http/custom.lua \
lua/http/vlm.html \
lua/http/images/buttons.png \
lua/http/images/speaker-32.png \
lua/http/images/vlc-48.png \
lua/http/images/Audio-48.png \
lua/http/images/Folder-48.png \
lua/http/images/Other-48.png \
lua/http/images/Back-48.png \
lua/http/images/Video-48.png \
lua/http/images/vlc16x16.png \
lua/http/mobile_equalizer.html \
lua/http/vlm_export.html \
lua/http/mobile_browse.html \
lua/http/favicon.ico \
lua/http/mobile_view.html \
lua/http/requests/playlist.xml \
lua/http/requests/playlist.json \
lua/http/requests/README.txt \
lua/http/requests/playlist_jstree.xml \
lua/http/requests/browse.xml \
lua/http/requests/browse.json \
lua/http/requests/vlm_cmd.xml \
lua/http/requests/status.xml \
lua/http/requests/status.json \
lua/http/requests/vlm.xml \
lua/http/index.html \
lua/http/css/ui-lightness/jquery-ui-1.8.13.custom.css \
lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png \
lua/http/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png \
lua/http/css/ui-lightness/images/ui-icons_ffffff_256x240.png \
lua/http/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png \
lua/http/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png \
lua/http/css/ui-lightness/images/ui-icons_222222_256x240.png \
lua/http/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png \
lua/http/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png \
lua/http/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png \
lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png \
lua/http/css/ui-lightness/images/ui-icons_ffd27a_256x240.png \
lua/http/css/ui-lightness/images/ui-icons_228ef1_256x240.png \
lua/http/css/ui-lightness/images/ui-icons_ef8c08_256x240.png \
lua/http/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png \
lua/http/css/main.css \
lua/http/css/mobile.css \
lua/http/js/ui.js \
lua/http/js/common.js \
lua/http/js/jquery.jstree.js \
lua/http/js/controllers.js
DIST_solid = \
solid/vlc-openbd.desktop \
solid/vlc-opencda.desktop \
......
......@@ -296,6 +296,7 @@ libvlccore_la_SOURCES = \
video_output/vout_wrapper.c \
network/getaddrinfo.c \
network/http_auth.c \
network/httpd.c \
network/io.c \
network/tcp.c \
network/udp.c \
......@@ -439,10 +440,6 @@ endif
endif
endif
if BUILD_HTTPD
libvlccore_la_SOURCES += network/httpd.c
endif
if ENABLE_SOUT
libvlccore_la_SOURCES += \
stream_output/sap.c stream_output/sdp.c \
......
......@@ -38,161 +38,6 @@
#include <vlc_common.h>
#include <assert.h>
#ifndef ENABLE_HTTPD
# include <vlc_httpd.h>
char *httpd_ClientIP (const httpd_client_t *cl, char *psz_ip, int *port)
{
(void) cl; (void) psz_ip; (void) port;
vlc_assert_unreachable ();
}
httpd_file_sys_t *httpd_FileDelete (httpd_file_t *file)
{
(void) file;
vlc_assert_unreachable ();
}
httpd_file_t *httpd_FileNew (httpd_host_t *host,
const char *url, const char *content_type,
const char *login, const char *password,
httpd_file_callback_t cb, httpd_file_sys_t *data)
{
(void) host;
(void) url; (void) content_type;
(void) login; (void) password;
(void) cb; (void) data;
vlc_assert_unreachable ();
}
void *httpd_HandlerDelete(httpd_handler_t *handler)
{
(void) handler;
vlc_assert_unreachable ();
}
httpd_handler_t *httpd_HandlerNew(httpd_host_t *host, const char *url,
const char *login, const char *password,
httpd_handler_callback_t cb,
void *data)
{
(void) host; (void) url;
(void) login; (void) password;
(void) cb; (void) data;
vlc_assert_unreachable ();
}
void httpd_HostDelete (httpd_host_t *h)
{
(void) h;
vlc_assert_unreachable ();
}
httpd_host_t *vlc_http_HostNew (vlc_object_t *obj)
{
msg_Err (obj, "HTTP server not compiled-in!");
return NULL;
}
httpd_host_t *vlc_https_HostNew (vlc_object_t *obj)
{
msg_Err (obj, "HTTPS server not compiled-in!");
return NULL;
}
httpd_host_t *vlc_rtsp_HostNew (vlc_object_t *obj)
{
msg_Err (obj, "RTSP server not compiled-in!");
return NULL;
}
void httpd_MsgAdd (httpd_message_t *m, const char *name, const char *fmt, ...)
{
(void) m; (void) name; (void) fmt;
vlc_assert_unreachable ();
}
const char *httpd_MsgGet (const httpd_message_t *m, const char *name)
{
(void) m; (void) name;
vlc_assert_unreachable ();
}
void httpd_RedirectDelete (httpd_redirect_t *r)
{
(void) r;
vlc_assert_unreachable ();
}
httpd_redirect_t *httpd_RedirectNew (httpd_host_t *host,
const char *dst, const char *src)
{
(void) host; (void) dst; (void) src;
vlc_assert_unreachable ();
}
char *httpd_ServerIP (const httpd_client_t *client, char *ip, int *port)
{
(void) client; (void) ip; (void) port;
vlc_assert_unreachable ();
}
void httpd_StreamDelete (httpd_stream_t *stream)
{
(void) stream;
vlc_assert_unreachable ();
}
int httpd_StreamHeader (httpd_stream_t *stream, uint8_t *data, int count)
{
(void) stream; (void) data; (void) count;
vlc_assert_unreachable ();
}
httpd_stream_t *httpd_StreamNew (httpd_host_t *host,
const char *url, const char *content_type,
const char *login, const char *password)
{
(void) host; (void) url; (void) content_type;
(void) login; (void) password;
vlc_assert_unreachable ();
}
int httpd_StreamSend (httpd_stream_t *stream, const block_t *p_block)
{
(void) stream; (void) p_block;
vlc_assert_unreachable ();
}
int httpd_StreamSetHTTPHeaders (httpd_stream_t * stream,
httpd_header * headers,
size_t i_headers)
{
(void) stream; (void) headers; (void) i_headers;
vlc_assert_unreachable ();
}
int httpd_UrlCatch (httpd_url_t *url, int request, httpd_callback_t cb,
httpd_callback_sys_t *data)
{
(void) url; (void) request; (void) cb; (void) data;
vlc_assert_unreachable ();
}
void httpd_UrlDelete (httpd_url_t *url)
{
(void) url;
vlc_assert_unreachable ();
}
httpd_url_t *httpd_UrlNew (httpd_host_t *host, const char *url,
const char *login, const char *password)
{
(void) host; (void) url; (void) login; (void) password;
vlc_assert_unreachable ();
}
#endif /* !ENABLE_HTTPD */
#ifndef ENABLE_SOUT
# include <vlc_sout.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment