Commit 17a681a2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Move some gcrypt-related logic to makefiles

parent 2a70bf34
......@@ -3983,11 +3983,6 @@ AS_IF([test "${enable_libgcrypt}" != "no"], [
)
])
if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then
AS_IF([test "${have_libgcrypt}" = "yes"],[
VLC_ADD_LIBS([rtp stream_out_rtp], [${GCRYPT_LIBS}])
])
fi
AC_SUBST(GCRYPT_CFLAGS)
AC_SUBST(GCRYPT_LIBS)
AM_CONDITIONAL([HAVE_GCRYPT], [test "${have_libgcrypt}" = "yes"])
......@@ -4007,14 +4002,6 @@ AS_IF([test "${have_libgcrypt}" != "yes"], [
AS_IF([test "${enable_gnutls}" != "no"], [
PKG_CHECK_MODULES(GNUTLS, [gnutls >= 2.0.0], [
VLC_ADD_PLUGIN([gnutls])
VLC_ADD_CFLAGS([gnutls], [$GNUTLS_CFLAGS])
AS_IF([test "${SYS}" = "mingw32"], [
dnl pkg-config --libs gnutls omits these
VLC_ADD_LIBS([gnutls], [-lz ${LTLIBINTL} -lcrypt32])
])
VLC_ADD_LIBS([gnutls], [${GCRYPT_LIBS}])
VLC_ADD_CFLAGS([gnutls], [${GCRYPT_CFLAGS}])
VLC_ADD_LIBS([gnutls], [$GNUTLS_LIBS])
], [
AS_IF([test -n "${enable_gnutls}"], [
AC_MSG_ERROR([${GNUTLS_PKG_ERRORS}.)])
......@@ -4023,36 +4010,6 @@ AS_IF([test "${enable_gnutls}" != "no"], [
])
dnl
dnl RemoteOSD plugin (VNC client as video filter)
dnl
AC_MSG_CHECKING([whether to enable the RemoteOSD plugin])
AS_IF([test "${have_libgcrypt}" = "yes"],[
AC_MSG_RESULT(yes)
VLC_ADD_PLUGIN([remoteosd])
VLC_ADD_LIBS([remoteosd], ${GCRYPT_LIBS})
VLC_ADD_CFLAGS([remoteosd], ${GCRYPT_CFLAGS})
], [
AC_MSG_RESULT(no)
AC_MSG_WARN([libgcrypt support required for RemoteOSD plugin])
])
dnl
dnl RAOP plugin
dnl
AC_MSG_CHECKING([whether to enable the RAOP plugin])
AS_IF([test "${have_libgcrypt}" = "yes"], [
AC_MSG_RESULT(yes)
VLC_ADD_PLUGIN([stream_out_raop])
VLC_ADD_LIBS([stream_out_raop], [${GCRYPT_LIBS} -lgpg-error])
VLC_ADD_CFLAGS([stream_out_raop], [${GCRYPT_CFLAGS}])
], [
AC_MSG_RESULT(no)
AC_MSG_WARN([libgcrypt support required for RAOP plugin])
])
dnl
dnl Nokia MCE plugin (Maemo screen unblanking)
dnl
......
......@@ -5,7 +5,6 @@ DIST_SUBDIRS = $(BASE_SUBDIRS)
SOURCES_logger = logger.c
SOURCES_vod_rtsp = rtsp.c
SOURCES_gnutls = gnutls.c dhparams.h
SOURCES_audioscrobbler = audioscrobbler.c
SOURCES_inhibit = inhibit.c
SOURCES_sqlite = sqlite.c
......@@ -14,6 +13,13 @@ SOURCES_xml = xml/libxml.c
SOURCES_memcpy = memcpy.c
libvlc_LTLIBRARIES += libmemcpy_plugin.la
libgnutls_plugin_la_SOURCES = gnutls.c dhparams.h
libgnutls_plugin_la_CFLAGS = $(AM_CFLAGS) $(GNUTLS_CFLAGS) $(GCRYPT_CFLAGS)
libgnutls_plugin_la_LIBADD = $(AM_LIBADD) $(GNUTLS_LIBS) $(GCRYPT_LIBS)
libgnutls_plugin_la_DEPENDENCIES =
EXTRA_LTLIBRARIES += libgnutls_plugin.la
libvlc_LTLIBRARIES += $(LTLIBgnutls)
libxdg_screensaver_plugin_la_SOURCES = inhibit/xdg.c
libxdg_screensaver_plugin_la_CFLAGS = $(AM_CFLAGS)
libxdg_screensaver_plugin_la_LIBADD = $(AM_LIBADD)
......
......@@ -13,7 +13,6 @@ SOURCES_stream_out_bridge = bridge.c
SOURCES_stream_out_mosaic_bridge = mosaic_bridge.c
SOURCES_stream_out_autodel = autodel.c
SOURCES_stream_out_record = record.c
SOURCES_stream_out_raop = raop.c
SOURCES_stream_out_smem = smem.c
SOURCES_stream_out_setid = setid.c
SOURCES_stream_out_langfromtelx = langfromtelx.c
......@@ -54,3 +53,12 @@ libstream_out_rtp_plugin_la_CFLAGS += -DHAVE_SRTP $(SRTP_CFLAGS) \
libstream_out_rtp_plugin_la_LIBADD += $(SRTP_LIBS) $(GCRYPT_LIBS)
libstream_out_rtp_plugin_la_DEPENDENCIES += $(SRTP_LIBS)
endif
# RAOP plugin
libstream_out_raop_plugin_la_SOURCES = raop.c
libstream_out_raop_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
libstream_out_raop_plugin_la_LIBADD = $(AM_LIBADD) $(GCRYPT_LIBS) -lgpg-error
libstream_out_raop_plugin_la_DEPENDENCIES =
if HAVE_GCRYPT
libvlc_LTLIBRARIES += libstream_out_raop_plugin.la
endif
......@@ -31,12 +31,18 @@ libosdmenu_plugin_la_SOURCES = osdmenu.c
libosdmenu_plugin_la_CFLAGS = $(AM_CFLAGS) -DPKGDATADIR=\"$(vlcdatadir)\"
libosdmenu_plugin_la_LIBADD = $(AM_LIBADD)
libosdmenu_plugin_la_DEPENDENCIES =
if BUILD_OSDMENU
libvlc_LTLIBRARIES += libosdmenu_plugin.la
endif
SOURCES_remoteosd = remoteosd.c remoteosd_rfbproto.h
libremoteosd_plugin_la_SOURCES = remoteosd.c remoteosd_rfbproto.h
libremoteosd_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
libremoteosd_plugin_la_LIBADD = $(AM_LIBADD) $(GCRYPT_LIBS)
libremoteosd_plugin_la_DEPENDENCIES =
if HAVE_GCRYPT
libvlc_LTLIBRARIES += libremoteosd_plugin.la
endif
SOURCES_magnify = magnify.c
SOURCES_wave = wave.c
SOURCES_ripple = ripple.c
......
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