X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=doc%2Finstallation.xml;h=9e5452f159056b399eb07d941f70d90ebfbbeae3;hb=6104404b99d63343646f1d8e21bce49a82c16d3d;hp=c6f81f22f1d88299b3ce3cdced0af3c42f824876;hpb=3a97efa8f888c8f5a5e36ad9ca004b55e0cca2c6;p=yaz-moved-to-github.git

diff --git a/doc/installation.xml b/doc/installation.xml
index c6f81f2..9e5452f 100644
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -252,11 +252,21 @@
       </varlistentry>
 
       <varlistentry><term>
+        <literal>--with-gnutls</literal>[=<replaceable>prefix</replaceable>]
+       </term>
+       <listitem><para>&yaz; will be linked with the GNU TLS libraries and
+         an SSL COMSTACK will be provided. By default configure enables
+         SSL support for YAZ if the GNU TLS development libraries are found
+         on the system.
+        </para></listitem>
+      </varlistentry>
+
+      <varlistentry><term>
         <literal>--with-openssl</literal>[=<replaceable>prefix</replaceable>]
        </term>
        <listitem><para>&yaz; will be linked with the OpenSSL libraries and
-         an SSL COMSTACK will be provided. Note that SSL support is still
-         experimental.
+         an SSL COMSTACK will be provided. If OpenSSL is enabled, GNU TLS
+         is automatically disabled.
         </para></listitem>
       </varlistentry>