X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=doc%2Finstallation.xml;h=3e23ca4c459b8a0fe524bd3f10cecbb6a3c95023;hp=a01b0188005b525d899db1a86504f713ed33e12d;hb=053367cbe356fb3ce0def34b065dae589d700daf;hpb=cdd67ab5b29250ce4c16dcaaecb62654346502c1;ds=sidebyside
diff --git a/doc/installation.xml b/doc/installation.xml
index a01b018..3e23ca4 100644
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -299,21 +299,22 @@
- --with-openssl[=prefix]
+ --with-icu[=prefix]
- &yaz; will be linked with the OpenSSL libraries and
- an SSL COMSTACK will be provided. If OpenSSL is enabled, GNU TLS
- is automatically disabled.
+ &yaz; will be linked the
+ ICU library in the prefix if given.
+ If prefix is not given, the libraries exposed by the script
+ icu-config will be used if found.
- --with-icu[=prefix]
+ --with-libgcrypt[=prefix]
- &yaz; will be linked the
- ICU library in the prefix if given.
+ &yaz; will be linked with
+ Libgcrypt in the prefix if given.
If prefix is not given, the libraries exposed by the script
- icu-config will be used if found.
+ libgcrypt-config will be used if found.
@@ -530,7 +531,7 @@
an installer from
here.
The installer comes with source too - in case you wish to
- compile YAZ with different Compiler options etc.
+ compile YAZ with different compiler options, etc.
@@ -538,9 +539,8 @@
&yaz; is shipped with "makefiles" for the NMAKE tool that comes
with
- Microsoft Visual Studio.
- Version 6 and .NET has been tested. We expect that &yaz; compiles
- with version 5 as well.
+ Microsoft Visual Studio. It has been tested with
+ Microsoft Visual Studio 2003/2005/2008.
Start a command prompt and switch the sub directory
@@ -566,7 +566,8 @@
If HAVE_TCL is set to 1, nmake will
use the ASN.1 compiler (Tcl based).
You must set TCL to the full path of the Tcl
- interpreter.
+ interpreter. A Windows version of Tcl is part of
+ Git for Windows.
If you do not have Tcl installed, set
@@ -578,7 +579,7 @@
HAVE_BISON,
BISON
- If GNU Bison is present, you might set HAVE_ICONV
+ If GNU Bison is present, you might set HAVE_BISON
to 1 and specify the Bison executable in BISON.
Bison is only required if you use the git version of
YAZ or if you modify the grammar for CQL
@@ -586,7 +587,7 @@
A Windows version of GNU Bison is part of
- unxutils.
+ Git for Windows.
@@ -691,44 +692,44 @@
The following files are generated upon successful compilation:
- bin/yaz4.dll /
- bin/yaz4d.dll
+ bin/yaz5.dll /
+ bin/yaz5d.dll
&yaz; Release/Debug DLL.
- lib/yaz4.lib /
- lib/yaz4d.lib
+ lib/yaz5.lib /
+ lib/yaz5d.lib
- Import library for yaz4.dll /
- yaz4d.dll.
+ Import library for yaz5.dll /
+ yaz5d.dll.
- bin/yaz_cond4.dll /
- bin/yaz_cond4d.dll
+ bin/yaz_cond5.dll /
+ bin/yaz_cond5d.dll
Release/Debug DLL for condition variable utilities (condvar.c).
- lib/yaz_cond4.lib /
- lib/yaz_cond4d.lib
+ lib/yaz_cond5.lib /
+ lib/yaz_cond5d.lib
- Import library for yaz_cond4.dll /
- yaz_cond4d.dll.
+ Import library for yaz_cond5.dll /
+ yaz_cond5d.dll.
- bin/yaz_icu4.dll /
- bin/yaz_icu4d.dll
+ bin/yaz_icu5.dll /
+ bin/yaz_icu5d.dll
Release/Debug DLL for the ICU wrapper utility.
Only build if HAVE_ICU is 1.
- lib/yaz_icu4.lib /
- lib/yaz_icu4d.lib
+ lib/yaz_icu5.lib /
+ lib/yaz_icu5d.lib
- Import library for yaz_icu4.dll /
- yaz_icu4d.dll.
+ Import library for yaz_icu5.dll /
+ yaz_icu5d.dll.
bin/yaz-ztest.exe
@@ -788,14 +789,14 @@
include path
Set it to the include directory of &yaz;.
- import library yaz4.lib
+ import library yaz5.lib
You must link with this library. It's located in the
sub directory lib of &yaz;.
If you want to link with the debug version of &yaz;, you must
- link against yaz4d.lib instead.
+ link against yaz5d.lib instead.
- dynamic link library yaz4.dll
+ dynamic link library yaz5.dll
This DLL must be in your execution path when you invoke
your application. Specifically, you should distribute this