Checks for gnutls

configure.ac

@@ -1211,10 +1211,9 @@ fi
 dnl
 dnl TLS/SSL
 dnl
-AC_ARG_ENABLE(tls,
-  [  --enable-tls            TLS/SSL support (default disabled)])
-AS_IF([test "${enable_tls}" == "yes"],
-  AC_DEFINE(ENABLE_TLS, 1, Define if you want the TLS/SSL support))
+AC_ARG_ENABLE(gnutls,
+  [  --enable-gnutls         gnutls TLS/SSL support (default disabled)])
+AS_IF([test "${enable_gnutls}" == "yes"], VLC_ADD_PLUGINS([gnutls]))
 
 
 dnl
@@ -3826,7 +3825,7 @@ dnl
 dnl GnuTLS-based TLS/SSL support
 dnl
 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="")
 
 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)
   no_libgnutls=""
 
@@ -3850,14 +3849,14 @@ if test "x$enable_tls" == "xyes"; then
 
   AS_IF([test "x$no_libgnutls" = x],
     AC_MSG_RESULT(yes)
-    VLC_ADD_CFLAGS([vlc], [$LIBGNUTLS_CFLAGS])
-    VLC_ADD_LDFLAGS([vlc], [$LIBGNUTLS_LIBS])
+    VLC_ADD_CFLAGS([gnutls], [$LIBGNUTLS_CFLAGS])
+    VLC_ADD_LDFLAGS([gnutls], [$LIBGNUTLS_LIBS])
     AC_DEFINE(HAVE_GNUTLS, 1, Define to 1 if you have libgnutls)
     ,
     AC_MSG_RESULT(no)
     LIBGNUTLS_CFLAGS=""
     LIBGNUTLS_LIBS=""
-    AC_MSG_ERROR(TLS/SSL support cannot be compiled)
+    AC_MSG_ERROR(gnutls TLS/SSL support cannot be compiled)
   )
 fi