[vlc-devel] commit: --disably-libgcrypt implies --disable-gnutls ( Rémi Denis-Courmont )

git version control git at videolan.org
Mon Jan 4 17:00:35 CET 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jan  4 18:00:10 2010 +0200| [2422af2987ff3ccd101c8bdf264b66195d0aa9e9] | committer: Rémi Denis-Courmont 

--disably-libgcrypt implies --disable-gnutls

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2422af2987ff3ccd101c8bdf264b66195d0aa9e9
---

 configure.ac |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index a2c8b74..fcd5970 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4622,6 +4622,12 @@ dnl
 AC_ARG_ENABLE(gnutls,
   [  --enable-gnutls         gnutls TLS/SSL support (default enabled)])
 
+AS_IF([test "${have_libgcrypt}" != "yes"], [
+  AS_IF([test "${enable_gnutls}" = "yes"], [
+    AC_MSG_ERROR([--enable-gnutls and --disable-libgcrypt are mutually exclusive.])
+  ])
+  enable_gnutls="no"
+])
 AS_IF([test "${enable_gnutls}" != "no"], [
   PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.7.4], [
     VLC_ADD_PLUGIN([gnutls])




More information about the vlc-devel mailing list