Commit 039deae0 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Checks for gnutls

parent c5d256a1
...@@ -1211,10 +1211,9 @@ fi ...@@ -1211,10 +1211,9 @@ fi
dnl dnl
dnl TLS/SSL dnl TLS/SSL
dnl dnl
AC_ARG_ENABLE(tls, AC_ARG_ENABLE(gnutls,
[ --enable-tls TLS/SSL support (default disabled)]) [ --enable-gnutls gnutls TLS/SSL support (default disabled)])
AS_IF([test "${enable_tls}" == "yes"], AS_IF([test "${enable_gnutls}" == "yes"], VLC_ADD_PLUGINS([gnutls]))
AC_DEFINE(ENABLE_TLS, 1, Define if you want the TLS/SSL support))
dnl dnl
...@@ -3826,7 +3825,7 @@ dnl ...@@ -3826,7 +3825,7 @@ dnl
dnl GnuTLS-based TLS/SSL support dnl GnuTLS-based TLS/SSL support
dnl dnl
AC_ARG_WITH(libgnutls-prefix, AC_ARG_WITH(libgnutls-prefix,
[ --with-libgnutls-prefix=PFX Set prefix where libgnutls is installed], [ --with-libgnutls-prefix=PREFIX set prefix where libgnutls is installed],
libgnutls_config_prefix="$withval", libgnutls_config_prefix="") libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
AS_IF([test x$libgnutls_config_prefix != x], AS_IF([test x$libgnutls_config_prefix != x],
...@@ -3835,7 +3834,7 @@ AS_IF([test x$libgnutls_config_prefix != x], ...@@ -3835,7 +3834,7 @@ AS_IF([test x$libgnutls_config_prefix != x],
) )
) )
if test "x$enable_tls" == "xyes"; then if test "x$enable_gnutls" == "xyes"; then
AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no) AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
no_libgnutls="" no_libgnutls=""
...@@ -3850,14 +3849,14 @@ if test "x$enable_tls" == "xyes"; then ...@@ -3850,14 +3849,14 @@ if test "x$enable_tls" == "xyes"; then
AS_IF([test "x$no_libgnutls" = x], AS_IF([test "x$no_libgnutls" = x],
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
VLC_ADD_CFLAGS([vlc], [$LIBGNUTLS_CFLAGS]) VLC_ADD_CFLAGS([gnutls], [$LIBGNUTLS_CFLAGS])
VLC_ADD_LDFLAGS([vlc], [$LIBGNUTLS_LIBS]) VLC_ADD_LDFLAGS([gnutls], [$LIBGNUTLS_LIBS])
AC_DEFINE(HAVE_GNUTLS, 1, Define to 1 if you have libgnutls) AC_DEFINE(HAVE_GNUTLS, 1, Define to 1 if you have libgnutls)
, ,
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
LIBGNUTLS_CFLAGS="" LIBGNUTLS_CFLAGS=""
LIBGNUTLS_LIBS="" LIBGNUTLS_LIBS=""
AC_MSG_ERROR(TLS/SSL support cannot be compiled) AC_MSG_ERROR(gnutls TLS/SSL support cannot be compiled)
) )
fi fi
......
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