X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2Finstallation.xml;h=53c5e6c1ae35de0a17b2526456e7ee53ee3fee89;hb=b41eafb39bc0ee50b4c5988f5ecfc6aad91933d5;hp=32ae63fb3ec360b1d291716b1cf81132fd987e26;hpb=2e8d07c37906b555ebdde08f2e855a391818f6b6;p=yaz-moved-to-github.git

diff --git a/doc/installation.xml b/doc/installation.xml
index 32ae63f..53c5e6c 100644
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -299,21 +299,33 @@
       </varlistentry>
 
       <varlistentry><term>
-        <literal>--with-openssl</literal>[=<replaceable>prefix</replaceable>]
+        <literal>--with-icu</literal>[=<replaceable>prefix</replaceable>]
        </term>
-       <listitem><para>&yaz; will be linked with the OpenSSL libraries and
-         an SSL COMSTACK will be provided. If OpenSSL is enabled, GNU TLS
-         is automatically disabled.
+       <listitem><para>&yaz; will be linked the
+	<ulink url="&url.icu;">ICU</ulink> library in the prefix if given.
+	If prefix is not given, the libraries exposed by the script
+	<application>icu-config</application> will be used if found.
         </para></listitem>
       </varlistentry>
 
       <varlistentry><term>
-        <literal>--with-icu</literal>[=<replaceable>prefix</replaceable>]
+        <literal>--with-libgcrypt</literal>[=<replaceable>prefix</replaceable>]
        </term>
-       <listitem><para>&yaz; will be linked the
-	<ulink url="&url.icu;">ICU</ulink> library in the prefix if given.
+       <listitem><para>&yaz; will be linked with
+	<ulink url="&url.libgcrypt;">Libgcrypt</ulink> in the prefix if given.
 	If prefix is not given, the libraries exposed by the script
-	<application>icu-config</application> will be used if found.
+	<application>libgcrypt-config</application> will be used if found.
+        </para></listitem>
+      </varlistentry>
+
+      <varlistentry><term>
+        <literal>--with-memcached</literal>
+       </term>
+       <listitem><para>&yaz; will be linked with
+	<ulink url="&url.libmemcached;">libMemcached</ulink> to allow
+	for result-set caching for ZOOM.
+	The prefix can not be given. Note that YAZ will only search
+	for libMemcached if Libgcrypt is also enabled.
         </para></listitem>
       </varlistentry>