summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-07-18 07:06:17 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-07-18 07:06:36 +0000
commita2e6f95a3875da6ea3c6b2056c6896a9ada570e4 (patch)
tree9ab04e4d3fa6159da793f6ffd1a55578237541b0
parentReleasing progress-linux version 1.2.25-2~dschinn1. (diff)
downloadxmlsec1-a2e6f95a3875da6ea3c6b2056c6896a9ada570e4.zip
xmlsec1-a2e6f95a3875da6ea3c6b2056c6896a9ada570e4.tar.xz
Merging upstream version 1.2.26.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--AUTHORS1
-rw-r--r--Makefile.in22
-rw-r--r--aclocal.m446
-rw-r--r--apps/Makefile.in14
-rw-r--r--apps/xmlsec.c31
-rwxr-xr-xconfig.guess679
-rw-r--r--config.h.in3
-rwxr-xr-xconfig.sub284
-rwxr-xr-xconfigure3449
-rw-r--r--configure.ac2102
-rwxr-xr-xdepcomp6
-rw-r--r--docs/Makefile.am14
-rw-r--r--docs/Makefile.in28
-rw-r--r--docs/api/Makefile.am145
-rw-r--r--docs/api/Makefile.in158
-rw-r--r--docs/api/home.pngbin169 -> 169 bytes
-rw-r--r--docs/api/index.html117
-rw-r--r--docs/api/left-insensitive.pngbin333 -> 334 bytes
-rw-r--r--docs/api/left.pngbin193 -> 185 bytes
-rw-r--r--docs/api/right-insensitive.pngbin233 -> 233 bytes
-rw-r--r--docs/api/right.pngbin185 -> 184 bytes
-rw-r--r--docs/api/src/xmlsec.sgml172
-rw-r--r--docs/api/tmpl/base/app.sgml1112
-rw-r--r--docs/api/tmpl/base/base64.sgml129
-rw-r--r--docs/api/tmpl/base/bn.sgml263
-rw-r--r--docs/api/tmpl/base/buffer.sgml232
-rw-r--r--docs/api/tmpl/base/dl.sgml94
-rw-r--r--docs/api/tmpl/base/errors.sgml504
-rw-r--r--docs/api/tmpl/base/exports.sgml29
-rw-r--r--docs/api/tmpl/base/io.sgml103
-rw-r--r--docs/api/tmpl/base/keyinfo.sgml312
-rw-r--r--docs/api/tmpl/base/keys.sgml521
-rw-r--r--docs/api/tmpl/base/keysdata.sgml930
-rw-r--r--docs/api/tmpl/base/keysmngr.sgml303
-rw-r--r--docs/api/tmpl/base/list.sgml275
-rw-r--r--docs/api/tmpl/base/membuf.sgml47
-rw-r--r--docs/api/tmpl/base/nodeset.sgml172
-rw-r--r--docs/api/tmpl/base/parser.sgml72
-rw-r--r--docs/api/tmpl/base/private.sgml315
-rw-r--r--docs/api/tmpl/base/soap.sgml36
-rw-r--r--docs/api/tmpl/base/templates.sgml449
-rw-r--r--docs/api/tmpl/base/transforms.sgml1323
-rw-r--r--docs/api/tmpl/base/version.sgml57
-rw-r--r--docs/api/tmpl/base/x509.sgml74
-rw-r--r--docs/api/tmpl/base/xmldsig.sgml316
-rw-r--r--docs/api/tmpl/base/xmlenc.sgml194
-rw-r--r--docs/api/tmpl/base/xmlsec-unused.sgml1028
-rw-r--r--docs/api/tmpl/base/xmlsec.sgml133
-rw-r--r--docs/api/tmpl/base/xmltree.sgml569
-rw-r--r--docs/api/tmpl/gcrypt/app.sgml189
-rw-r--r--docs/api/tmpl/gcrypt/crypto.sgml708
-rw-r--r--docs/api/tmpl/gcrypt/xmlsec-gcrypt-unused.sgml15
-rw-r--r--docs/api/tmpl/gnutls/app.sgml189
-rw-r--r--docs/api/tmpl/gnutls/crypto.sgml674
-rw-r--r--docs/api/tmpl/gnutls/x509.sgml193
-rw-r--r--docs/api/tmpl/gnutls/xmlsec-gnutls-unused.sgml78
-rw-r--r--docs/api/tmpl/mscrypto/app.sgml258
-rw-r--r--docs/api/tmpl/mscrypto/certkeys.sgml96
-rw-r--r--docs/api/tmpl/mscrypto/crypto.sgml728
-rw-r--r--docs/api/tmpl/mscrypto/keysstore.sgml70
-rw-r--r--docs/api/tmpl/mscrypto/x509.sgml197
-rw-r--r--docs/api/tmpl/mscrypto/xmlsec-mscrypto-unused.sgml141
-rw-r--r--docs/api/tmpl/nss/app.sgml247
-rw-r--r--docs/api/tmpl/nss/bignum.sgml44
-rw-r--r--docs/api/tmpl/nss/crypto.sgml781
-rw-r--r--docs/api/tmpl/nss/keysstore.sgml70
-rw-r--r--docs/api/tmpl/nss/pkikeys.sgml69
-rw-r--r--docs/api/tmpl/nss/x509.sgml192
-rw-r--r--docs/api/tmpl/nss/xmlsec-nss-unused.sgml8
-rw-r--r--docs/api/tmpl/openssl/app.sgml267
-rw-r--r--docs/api/tmpl/openssl/bn.sgml43
-rw-r--r--docs/api/tmpl/openssl/ciphers.sgml18
-rw-r--r--docs/api/tmpl/openssl/crypto.sgml1238
-rw-r--r--docs/api/tmpl/openssl/evp.sgml59
-rw-r--r--docs/api/tmpl/openssl/x509.sgml237
-rw-r--r--docs/api/tmpl/openssl/xmlsec-openssl-unused.sgml60
-rw-r--r--docs/api/up-insensitive.pngbin288 -> 288 bytes
-rw-r--r--docs/api/up.pngbin187 -> 186 bytes
-rw-r--r--docs/api/xmlsec-app.html36
-rw-r--r--docs/api/xmlsec-base64.html36
-rw-r--r--docs/api/xmlsec-bn.html34
-rw-r--r--docs/api/xmlsec-buffer.html36
-rw-r--r--docs/api/xmlsec-custom-keys-manager.html27
-rw-r--r--docs/api/xmlsec-decrypt-with-keys-mngr.html27
-rw-r--r--docs/api/xmlsec-decrypt-with-signle-key.html27
-rw-r--r--docs/api/xmlsec-dl.html36
-rw-r--r--docs/api/xmlsec-encrypt-dynamic-template.html27
-rw-r--r--docs/api/xmlsec-encrypt-template-file.html27
-rw-r--r--docs/api/xmlsec-encrypt-with-session-key.html27
-rw-r--r--docs/api/xmlsec-encryption-klasses.html27
-rw-r--r--docs/api/xmlsec-errors.html36
-rw-r--r--docs/api/xmlsec-examples-sign-dynamimc-template.html27
-rw-r--r--docs/api/xmlsec-examples-sign-template-file.html27
-rw-r--r--docs/api/xmlsec-examples-sign-x509.html27
-rw-r--r--docs/api/xmlsec-examples.html27
-rw-r--r--docs/api/xmlsec-gcrypt-app.html36
-rw-r--r--docs/api/xmlsec-gcrypt-crypto.html34
-rw-r--r--docs/api/xmlsec-gcrypt-ref.html29
-rw-r--r--docs/api/xmlsec-gnutls-app.html36
-rw-r--r--docs/api/xmlsec-gnutls-crypto.html34
-rw-r--r--docs/api/xmlsec-gnutls-ref.html31
-rw-r--r--docs/api/xmlsec-gnutls-x509.html36
-rw-r--r--docs/api/xmlsec-index.html164
-rw-r--r--docs/api/xmlsec-io.html36
-rw-r--r--docs/api/xmlsec-keyinfo.html66
-rw-r--r--docs/api/xmlsec-keys.html36
-rw-r--r--docs/api/xmlsec-keysdata.html64
-rw-r--r--docs/api/xmlsec-keysmngr.html36
-rw-r--r--docs/api/xmlsec-list.html36
-rw-r--r--docs/api/xmlsec-membuf.html36
-rw-r--r--docs/api/xmlsec-msccng-ref.html136
-rw-r--r--docs/api/xmlsec-mscng-app.html892
-rw-r--r--docs/api/xmlsec-mscng-certkeys.html260
-rw-r--r--docs/api/xmlsec-mscng-crypto.html1463
-rw-r--r--docs/api/xmlsec-mscng-keysstore.html326
-rw-r--r--docs/api/xmlsec-mscng-x509.html620
-rw-r--r--docs/api/xmlsec-mscrypto-app.html40
-rw-r--r--docs/api/xmlsec-mscrypto-certkeys.html38
-rw-r--r--docs/api/xmlsec-mscrypto-crypto.html202
-rw-r--r--docs/api/xmlsec-mscrypto-keysstore.html44
-rw-r--r--docs/api/xmlsec-mscrypto-ref.html48
-rw-r--r--docs/api/xmlsec-mscrypto-x509.html42
-rw-r--r--docs/api/xmlsec-nodeset.html36
-rw-r--r--docs/api/xmlsec-notes-compiling-others.html27
-rw-r--r--docs/api/xmlsec-notes-compiling-unix.html27
-rw-r--r--docs/api/xmlsec-notes-compiling-windows.html27
-rw-r--r--docs/api/xmlsec-notes-compiling.html27
-rw-r--r--docs/api/xmlsec-notes-contexts.html27
-rw-r--r--docs/api/xmlsec-notes-custom-keys-store.html27
-rw-r--r--docs/api/xmlsec-notes-decrypt.html27
-rw-r--r--docs/api/xmlsec-notes-dynamic-encryption-templates.html27
-rw-r--r--docs/api/xmlsec-notes-dynamic-signature-templates.html27
-rw-r--r--docs/api/xmlsec-notes-encrypt.html27
-rw-r--r--docs/api/xmlsec-notes-include-files.html27
-rw-r--r--docs/api/xmlsec-notes-init-shutdown.html27
-rw-r--r--docs/api/xmlsec-notes-keys-manager-sign-enc.html27
-rw-r--r--docs/api/xmlsec-notes-keys-mngr-verify-decrypt.html27
-rw-r--r--docs/api/xmlsec-notes-keys.html27
-rw-r--r--docs/api/xmlsec-notes-keysmngr.html27
-rw-r--r--docs/api/xmlsec-notes-new-crypto-functions.html27
-rw-r--r--docs/api/xmlsec-notes-new-crypto-key-stores.html138
-rw-r--r--docs/api/xmlsec-notes-new-crypto-keys.html27
-rw-r--r--docs/api/xmlsec-notes-new-crypto-klasses.html27
-rw-r--r--docs/api/xmlsec-notes-new-crypto-sharing-results.html27
-rw-r--r--docs/api/xmlsec-notes-new-crypto-simple-keys-mngr.html27
-rw-r--r--docs/api/xmlsec-notes-new-crypto-skeleton.html27
-rw-r--r--docs/api/xmlsec-notes-new-crypto-transforms.html27
-rw-r--r--docs/api/xmlsec-notes-new-crypto.html27
-rw-r--r--docs/api/xmlsec-notes-overview.html30
-rw-r--r--docs/api/xmlsec-notes-sign-encrypt.html27
-rw-r--r--docs/api/xmlsec-notes-sign-x509.html27
-rw-r--r--docs/api/xmlsec-notes-sign.html27
-rw-r--r--docs/api/xmlsec-notes-simple-keys-store.html27
-rw-r--r--docs/api/xmlsec-notes-structure.html29
-rw-r--r--docs/api/xmlsec-notes-templates.html27
-rw-r--r--docs/api/xmlsec-notes-transforms.html27
-rw-r--r--docs/api/xmlsec-notes-verify-decrypt.html27
-rw-r--r--docs/api/xmlsec-notes-verify-x509.html27
-rw-r--r--docs/api/xmlsec-notes-verify.html27
-rw-r--r--docs/api/xmlsec-notes-x509.html27
-rw-r--r--docs/api/xmlsec-notes.html27
-rw-r--r--docs/api/xmlsec-nss-app.html36
-rw-r--r--docs/api/xmlsec-nss-bignum.html36
-rw-r--r--docs/api/xmlsec-nss-crypto.html34
-rw-r--r--docs/api/xmlsec-nss-keysstore.html42
-rw-r--r--docs/api/xmlsec-nss-pkikeys.html36
-rw-r--r--docs/api/xmlsec-nss-ref.html35
-rw-r--r--docs/api/xmlsec-nss-x509.html38
-rw-r--r--docs/api/xmlsec-openssl-app.html36
-rw-r--r--docs/api/xmlsec-openssl-bn.html36
-rw-r--r--docs/api/xmlsec-openssl-crypto.html56
-rw-r--r--docs/api/xmlsec-openssl-evp.html36
-rw-r--r--docs/api/xmlsec-openssl-ref.html35
-rw-r--r--docs/api/xmlsec-openssl-x509.html36
-rw-r--r--docs/api/xmlsec-parser.html36
-rw-r--r--docs/api/xmlsec-ref.html65
-rw-r--r--docs/api/xmlsec-reference.html117
-rw-r--r--docs/api/xmlsec-signature-klasses.html27
-rw-r--r--docs/api/xmlsec-templates.html36
-rw-r--r--docs/api/xmlsec-transforms.html67
-rw-r--r--docs/api/xmlsec-verify-with-key.html27
-rw-r--r--docs/api/xmlsec-verify-with-keys-mngr.html27
-rw-r--r--docs/api/xmlsec-verify-with-restrictions.html27
-rw-r--r--docs/api/xmlsec-verify-with-x509.html29
-rw-r--r--docs/api/xmlsec-version.html40
-rw-r--r--docs/api/xmlsec-x509.html36
-rw-r--r--docs/api/xmlsec-xmldsig.html36
-rw-r--r--docs/api/xmlsec-xmlenc.html34
-rw-r--r--docs/api/xmlsec-xmlsec.html37
-rw-r--r--docs/api/xmlsec-xmltree.html44
-rw-r--r--docs/authors.html161
-rw-r--r--docs/bugs.html161
-rw-r--r--docs/c14n.html161
-rw-r--r--docs/documentation.html161
-rw-r--r--docs/download.html165
-rw-r--r--docs/faq.html167
-rw-r--r--docs/index.html194
-rw-r--r--docs/news.html173
-rw-r--r--docs/related.html161
-rw-r--r--docs/xmldsig-verifier.html161
-rw-r--r--docs/xmldsig.html161
-rw-r--r--docs/xmlenc.html161
-rw-r--r--docs/xmlsec-ga.xsl21
-rw-r--r--docs/xmlsec-man.html4
-rw-r--r--examples/verify3.c2
-rw-r--r--include/Makefile.in14
-rw-r--r--include/xmlsec/Makefile.in14
-rw-r--r--include/xmlsec/crypto.h7
-rw-r--r--include/xmlsec/gcrypt/Makefile.in14
-rw-r--r--include/xmlsec/gnutls/Makefile.in14
-rw-r--r--include/xmlsec/keysdata.h4
-rw-r--r--include/xmlsec/mscng/Makefile.am16
-rw-r--r--include/xmlsec/mscng/Makefile.in689
-rw-r--r--include/xmlsec/mscng/app.h100
-rw-r--r--include/xmlsec/mscng/certkeys.h33
-rw-r--r--include/xmlsec/mscng/crypto.h475
-rw-r--r--include/xmlsec/mscng/keysstore.h41
-rw-r--r--include/xmlsec/mscng/symbols.h122
-rw-r--r--include/xmlsec/mscng/x509.h83
-rw-r--r--include/xmlsec/mscrypto/Makefile.in14
-rw-r--r--include/xmlsec/mscrypto/crypto.h76
-rw-r--r--include/xmlsec/mscrypto/symbols.h4
-rw-r--r--include/xmlsec/nss/Makefile.in14
-rw-r--r--include/xmlsec/openssl/Makefile.in14
-rw-r--r--include/xmlsec/openssl/crypto.h10
-rw-r--r--include/xmlsec/private/Makefile.in14
-rw-r--r--include/xmlsec/version.h13
-rw-r--r--include/xmlsec/version.h.in7
-rw-r--r--ltmain.sh4
-rw-r--r--m4/libtool.m41
-rw-r--r--man/Makefile.in14
-rw-r--r--man/xmlsec1-config.14
-rw-r--r--man/xmlsec1.18
-rwxr-xr-xscripts/build_release.sh44
-rwxr-xr-xscripts/remove-gtkdoclink.pl2
-rw-r--r--src/Makefile.in14
-rw-r--r--src/app.c8
-rw-r--r--src/base64.c10
-rw-r--r--src/bn.c8
-rw-r--r--src/buffer.c8
-rw-r--r--src/c14n.c7
-rw-r--r--src/dl.c7
-rw-r--r--src/enveloped.c7
-rw-r--r--src/errors.c8
-rw-r--r--src/gcrypt/Makefile.in14
-rw-r--r--src/gcrypt/app.c7
-rw-r--r--src/gcrypt/asn1.c8
-rw-r--r--src/gcrypt/asymkeys.c8
-rw-r--r--src/gcrypt/ciphers.c8
-rw-r--r--src/gcrypt/crypto.c8
-rw-r--r--src/gcrypt/digests.c8
-rw-r--r--src/gcrypt/hmac.c8
-rw-r--r--src/gcrypt/kw_aes.c8
-rw-r--r--src/gcrypt/kw_des.c9
-rw-r--r--src/gcrypt/signatures.c8
-rw-r--r--src/gcrypt/symkeys.c8
-rw-r--r--src/gnutls/Makefile.in14
-rw-r--r--src/gnutls/app.c8
-rw-r--r--src/gnutls/asymkeys.c8
-rw-r--r--src/gnutls/ciphers.c8
-rw-r--r--src/gnutls/crypto.c8
-rw-r--r--src/gnutls/digests.c8
-rw-r--r--src/gnutls/hmac.c8
-rw-r--r--src/gnutls/kw_aes.c8
-rw-r--r--src/gnutls/kw_des.c8
-rw-r--r--src/gnutls/signatures.c8
-rw-r--r--src/gnutls/symkeys.c8
-rw-r--r--src/gnutls/x509.c9
-rw-r--r--src/gnutls/x509utils.c8
-rw-r--r--src/gnutls/x509vfy.c9
-rw-r--r--src/io.c43
-rw-r--r--src/keyinfo.c29
-rw-r--r--src/keys.c9
-rw-r--r--src/keysdata.c16
-rw-r--r--src/keysmngr.c8
-rw-r--r--src/kw_aes_des.c9
-rw-r--r--src/list.c10
-rw-r--r--src/membuf.c9
-rw-r--r--src/mscng/Makefile.am49
-rw-r--r--src/mscng/Makefile.in933
-rw-r--r--src/mscng/README16
-rw-r--r--src/mscng/app.c713
-rw-r--r--src/mscng/certkeys.c1650
-rw-r--r--src/mscng/ciphers.c902
-rw-r--r--src/mscng/crypto.c554
-rw-r--r--src/mscng/digests.c588
-rw-r--r--src/mscng/globals.h65
-rw-r--r--src/mscng/hmac.c691
-rw-r--r--src/mscng/keysstore.c518
-rw-r--r--src/mscng/kt_rsa.c528
-rw-r--r--src/mscng/kw_aes.c702
-rw-r--r--src/mscng/kw_des.c790
-rw-r--r--src/mscng/signatures.c1028
-rw-r--r--src/mscng/symkeys.c345
-rw-r--r--src/mscng/x509.c1419
-rw-r--r--src/mscng/x509vfy.c1187
-rw-r--r--src/mscrypto/Makefile.in14
-rw-r--r--src/mscrypto/app.c26
-rw-r--r--src/mscrypto/certkeys.c342
-rw-r--r--src/mscrypto/ciphers.c8
-rw-r--r--src/mscrypto/crypto.c21
-rw-r--r--src/mscrypto/csp_calg.h20
-rw-r--r--src/mscrypto/csp_oid.h10
-rw-r--r--src/mscrypto/digests.c127
-rw-r--r--src/mscrypto/hmac.c23
-rw-r--r--src/mscrypto/keysstore.c21
-rw-r--r--src/mscrypto/kt_rsa.c8
-rw-r--r--src/mscrypto/kw_aes.c8
-rw-r--r--src/mscrypto/kw_des.c8
-rw-r--r--src/mscrypto/signatures.c141
-rw-r--r--src/mscrypto/symkeys.c8
-rw-r--r--src/mscrypto/x509.c8
-rw-r--r--src/mscrypto/x509vfy.c9
-rw-r--r--src/nodeset.c8
-rw-r--r--src/nss/Makefile.in14
-rw-r--r--src/nss/app.c8
-rw-r--r--src/nss/bignum.c8
-rw-r--r--src/nss/ciphers.c8
-rw-r--r--src/nss/crypto.c12
-rw-r--r--src/nss/digests.c8
-rw-r--r--src/nss/hmac.c8
-rw-r--r--src/nss/keysstore.c16
-rw-r--r--src/nss/keytrans.c10
-rw-r--r--src/nss/kw_aes.c8
-rw-r--r--src/nss/kw_des.c8
-rw-r--r--src/nss/pkikeys.c10
-rw-r--r--src/nss/signatures.c8
-rw-r--r--src/nss/symkeys.c8
-rw-r--r--src/nss/x509.c9
-rw-r--r--src/nss/x509vfy.c9
-rw-r--r--src/openssl/Makefile.in14
-rw-r--r--src/openssl/app.c7
-rw-r--r--src/openssl/bn.c8
-rw-r--r--src/openssl/ciphers.c8
-rw-r--r--src/openssl/crypto.c8
-rw-r--r--src/openssl/digests.c8
-rw-r--r--src/openssl/evp.c10
-rw-r--r--src/openssl/evp_signatures.c8
-rw-r--r--src/openssl/hmac.c22
-rw-r--r--src/openssl/kt_rsa.c8
-rw-r--r--src/openssl/kw_aes.c8
-rw-r--r--src/openssl/kw_des.c8
-rw-r--r--src/openssl/openssl_compat.h15
-rw-r--r--src/openssl/signatures.c8
-rw-r--r--src/openssl/symkeys.c8
-rw-r--r--src/openssl/x509.c18
-rw-r--r--src/openssl/x509vfy.c13
-rw-r--r--src/parser.c8
-rw-r--r--src/relationship.c52
-rw-r--r--src/skeleton/app.c8
-rw-r--r--src/skeleton/crypto.c8
-rw-r--r--src/soap.c7
-rw-r--r--src/strings.c7
-rw-r--r--src/templates.c7
-rw-r--r--src/transforms.c34
-rw-r--r--src/x509.c8
-rw-r--r--src/xmldsig.c11
-rw-r--r--src/xmlenc.c10
-rw-r--r--src/xmlsec.c8
-rw-r--r--src/xmltree.c10
-rw-r--r--src/xpath.c11
-rw-r--r--src/xslt.c9
-rw-r--r--tests/README13
-rw-r--r--tests/keysstore/README9
-rw-r--r--tests/keysstore/keysstore.xml17
-rwxr-xr-xtests/testDSig.sh18
-rwxr-xr-xtests/testEnc.sh16
-rwxr-xr-xtests/testKeys.sh12
-rwxr-xr-xtests/testrun.sh7
-rw-r--r--win32/Makefile.msvc118
-rw-r--r--win32/configure.js20
-rw-r--r--xmlsec-gcrypt.pc.in1
-rw-r--r--xmlsec-gnutls.pc.in1
-rw-r--r--xmlsec-nss.pc.in1
-rw-r--r--xmlsec-openssl.pc.in1
-rwxr-xr-xxmlsec1-config10
-rw-r--r--xmlsec1-gcrypt.pc7
-rw-r--r--xmlsec1-gnutls.pc3
-rw-r--r--xmlsec1-nss.pc3
-rw-r--r--xmlsec1-openssl.pc3
-rw-r--r--xmlsec1.pc2
-rw-r--r--xmlsec1.spec2
-rwxr-xr-xxmlsec1Conf.sh2
383 files changed, 30071 insertions, 19946 deletions
diff --git a/AUTHORS b/AUTHORS
index 3003d13..ec43402 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,5 +4,6 @@ Windows port: Igor Zlatkovic <igor@stud.fh-frankfurt.de>
Debian port: John Belmonte <jvb@prairienet.org>
xmlsec-nss: Tej Arora <tej@netscape.com>, AOL Inc.
xmlsec-mscrypto: Wouter Ketting <wsh@xs4all.nl>, Cordys R&D BV
+xmlsec-mscng: Miklos Vajna <vmiklos@vmiklos.hu>
GOST support: Dmitry Belyavsky <beldmit@cryptocom.ru>, Cryptocom LTD (http://www.cryptocom.ru)
diff --git a/Makefile.in b/Makefile.in
index ee6a5e2..870cf89 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -273,6 +273,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GCRYPT_CFLAGS = @GCRYPT_CFLAGS@
+GCRYPT_CONFIG_PATH = @GCRYPT_CONFIG_PATH@
GCRYPT_CRYPTO_LIB = @GCRYPT_CRYPTO_LIB@
GCRYPT_LIBS = @GCRYPT_LIBS@
GCRYPT_MIN_VERSION = @GCRYPT_MIN_VERSION@
@@ -283,7 +284,6 @@ GNUTLS_MIN_VERSION = @GNUTLS_MIN_VERSION@
GREP = @GREP@
GTKDOC_MKDB = @GTKDOC_MKDB@
GTKDOC_MKHTML = @GTKDOC_MKHTML@
-GTKDOC_MKTMPL = @GTKDOC_MKTMPL@
GTKDOC_SCAN = @GTKDOC_SCAN@
HELP2MAN = @HELP2MAN@
INSTALL = @INSTALL@
@@ -298,10 +298,12 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBXML_CFLAGS = @LIBXML_CFLAGS@
LIBXML_CONFIG = @LIBXML_CONFIG@
+LIBXML_CONFIG_PATH = @LIBXML_CONFIG_PATH@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_MIN_VERSION = @LIBXML_MIN_VERSION@
LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
LIBXSLT_CONFIG = @LIBXSLT_CONFIG@
+LIBXSLT_CONFIG_PATH = @LIBXSLT_CONFIG_PATH@
LIBXSLT_LIBS = @LIBXSLT_LIBS@
LIBXSLT_MIN_VERSION = @LIBXSLT_MIN_VERSION@
LIBXSLT_PC_FILE_COND = @LIBXSLT_PC_FILE_COND@
@@ -315,12 +317,17 @@ MAN2HTML = @MAN2HTML@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCNG_CFLAGS = @MSCNG_CFLAGS@
+MSCNG_CRYPTO_LIB = @MSCNG_CRYPTO_LIB@
+MSCNG_LIBS = @MSCNG_LIBS@
MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
MV = @MV@
NM = @NM@
NMEDIT = @NMEDIT@
+NSPR_CFLAGS = @NSPR_CFLAGS@
+NSPR_LIBS = @NSPR_LIBS@
NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
NSPR_PACKAGE = @NSPR_PACKAGE@
NSS_CFLAGS = @NSS_CFLAGS@
@@ -393,6 +400,7 @@ XMLSEC_NO_GOST2012 = @XMLSEC_NO_GOST2012@
XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
+XMLSEC_NO_MSCNG = @XMLSEC_NO_MSCNG@
XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
XMLSEC_NO_OPENSSL = @XMLSEC_NO_OPENSSL@
@@ -896,7 +904,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
@@ -922,7 +930,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
@@ -940,7 +948,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -950,7 +958,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
diff --git a/aclocal.m4 b/aclocal.m4
index 8798bb5..28dc93a 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -296,7 +296,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])dnl PKG_CHECK_VAR
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -311,7 +311,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.15], [],
+m4_if([$1], [1.15.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -327,14 +327,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -386,7 +386,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -417,7 +417,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -608,7 +608,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -684,7 +684,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -881,7 +881,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -902,7 +902,7 @@ if test x"${install_sh+set}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -924,7 +924,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -959,7 +959,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1009,7 +1009,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1048,7 +1048,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1077,7 +1077,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1124,7 +1124,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1143,7 +1143,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1224,7 +1224,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1284,7 +1284,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1312,7 +1312,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1331,7 +1331,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/apps/Makefile.in b/apps/Makefile.in
index b80346a..7d012d6 100644
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -213,6 +213,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GCRYPT_CFLAGS = @GCRYPT_CFLAGS@
+GCRYPT_CONFIG_PATH = @GCRYPT_CONFIG_PATH@
GCRYPT_CRYPTO_LIB = @GCRYPT_CRYPTO_LIB@
GCRYPT_LIBS = @GCRYPT_LIBS@
GCRYPT_MIN_VERSION = @GCRYPT_MIN_VERSION@
@@ -223,7 +224,6 @@ GNUTLS_MIN_VERSION = @GNUTLS_MIN_VERSION@
GREP = @GREP@
GTKDOC_MKDB = @GTKDOC_MKDB@
GTKDOC_MKHTML = @GTKDOC_MKHTML@
-GTKDOC_MKTMPL = @GTKDOC_MKTMPL@
GTKDOC_SCAN = @GTKDOC_SCAN@
HELP2MAN = @HELP2MAN@
INSTALL = @INSTALL@
@@ -238,10 +238,12 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBXML_CFLAGS = @LIBXML_CFLAGS@
LIBXML_CONFIG = @LIBXML_CONFIG@
+LIBXML_CONFIG_PATH = @LIBXML_CONFIG_PATH@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_MIN_VERSION = @LIBXML_MIN_VERSION@
LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
LIBXSLT_CONFIG = @LIBXSLT_CONFIG@
+LIBXSLT_CONFIG_PATH = @LIBXSLT_CONFIG_PATH@
LIBXSLT_LIBS = @LIBXSLT_LIBS@
LIBXSLT_MIN_VERSION = @LIBXSLT_MIN_VERSION@
LIBXSLT_PC_FILE_COND = @LIBXSLT_PC_FILE_COND@
@@ -255,12 +257,17 @@ MAN2HTML = @MAN2HTML@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCNG_CFLAGS = @MSCNG_CFLAGS@
+MSCNG_CRYPTO_LIB = @MSCNG_CRYPTO_LIB@
+MSCNG_LIBS = @MSCNG_LIBS@
MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
MV = @MV@
NM = @NM@
NMEDIT = @NMEDIT@
+NSPR_CFLAGS = @NSPR_CFLAGS@
+NSPR_LIBS = @NSPR_LIBS@
NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
NSPR_PACKAGE = @NSPR_PACKAGE@
NSS_CFLAGS = @NSS_CFLAGS@
@@ -333,6 +340,7 @@ XMLSEC_NO_GOST2012 = @XMLSEC_NO_GOST2012@
XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
+XMLSEC_NO_MSCNG = @XMLSEC_NO_MSCNG@
XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
XMLSEC_NO_OPENSSL = @XMLSEC_NO_OPENSSL@
diff --git a/apps/xmlsec.c b/apps/xmlsec.c
index e28c23e..70d28b6 100644
--- a/apps/xmlsec.c
+++ b/apps/xmlsec.c
@@ -28,6 +28,7 @@
#include <libexslt/exslt.h>
#endif /* XMLSEC_NO_XSLT */
+#define XMLSEC_PRIVATE
#include <xmlsec/xmlsec.h>
#include <xmlsec/xmltree.h>
#include <xmlsec/keys.h>
@@ -656,6 +657,17 @@ static xmlSecAppCmdLineParam pkcs12Param = {
NULL
};
+static xmlSecAppCmdLineParam pkcs12PersistParam = {
+ xmlSecAppCmdLineTopicKeysMngr,
+ "--pkcs12-persist",
+ NULL,
+ "--pkcs12-persist"
+ "\n\tpersist loaded private key",
+ xmlSecAppCmdLineParamTypeFlag,
+ xmlSecAppCmdLineParamFlagNone,
+ NULL
+};
+
static xmlSecAppCmdLineParam pubkeyCertParam = {
xmlSecAppCmdLineTopicKeysMngr,
"--pubkey-cert-pem",
@@ -819,6 +831,7 @@ static xmlSecAppCmdLineParamPtr parameters[] = {
&pwdParam,
#ifndef XMLSEC_NO_X509
&pkcs12Param,
+ &pkcs12PersistParam,
&pubkeyCertParam,
&pubkeyCertDerParam,
&trustedParam,
@@ -1837,6 +1850,8 @@ static int
xmlSecAppPrepareKeyInfoReadCtx(xmlSecKeyInfoCtxPtr keyInfoCtx) {
xmlSecAppCmdLineValuePtr value;
int ret;
+ xmlSecKeyDataId dataId;
+ const char* p;
if(keyInfoCtx == NULL) {
fprintf(stderr, "Error: key info context is null\n");
@@ -1865,8 +1880,6 @@ xmlSecAppPrepareKeyInfoReadCtx(xmlSecKeyInfoCtxPtr keyInfoCtx) {
enabledKeyDataParam.fullName);
return(-1);
}
- xmlSecKeyDataId dataId;
- const char* p;
for(p = value->strListValue; (p != NULL) && ((*p) != '\0'); p += strlen(p)) {
dataId = xmlSecKeyDataIdListFindByName(xmlSecKeyDataIdsGet(), BAD_CAST p, xmlSecKeyDataUsageAny);
@@ -2086,6 +2099,9 @@ xmlSecAppLoadKeys(void) {
#ifndef XMLSEC_NO_X509
/* read all pkcs12 files */
+ if(xmlSecAppCmdLineParamIsSet(&pkcs12PersistParam)) {
+ xmlSecImportSetPersistKey();
+ }
for(value = pkcs12Param.value; value != NULL; value = value->next) {
if(value->strValue == NULL) {
fprintf(stderr, "Error: invalid value for option \"%s\".\n", pkcs12Param.fullName);
@@ -2285,6 +2301,11 @@ xmlSecAppXmlDataCreate(const char* filename, const xmlChar* defStartNodeName, co
xmlSecAppCmdLineValuePtr value;
xmlSecAppXmlDataPtr data;
xmlNodePtr cur = NULL;
+
+ xmlChar* attrName;
+ xmlChar* nodeName;
+ xmlChar* nsHref;
+ xmlChar* buf;
if(filename == NULL) {
fprintf(stderr, "Error: xml filename is null\n");
@@ -2333,10 +2354,7 @@ xmlSecAppXmlDataCreate(const char* filename, const xmlChar* defStartNodeName, co
xmlSecAppXmlDataDestroy(data);
return(NULL);
}
- xmlChar* attrName = (value->paramNameValue != NULL) ? BAD_CAST value->paramNameValue : BAD_CAST "id";
- xmlChar* nodeName;
- xmlChar* nsHref;
- xmlChar* buf;
+ attrName = (value->paramNameValue != NULL) ? BAD_CAST value->paramNameValue : BAD_CAST "id";
buf = xmlStrdup(BAD_CAST value->strValue);
if(buf == NULL) {
@@ -2382,7 +2400,6 @@ xmlSecAppXmlDataCreate(const char* filename, const xmlChar* defStartNodeName, co
}
cur = attr->parent;
} else if(xmlSecAppCmdLineParamGetString(&nodeNameParam) != NULL) {
- xmlChar* buf;
xmlChar* name;
xmlChar* ns;
diff --git a/config.guess b/config.guess
index 1659250..f50dcdb 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2015 Free Software Foundation, Inc.
+# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2015-08-20'
+timestamp='2018-02-24'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2015-08-20'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@ timestamp='2015-08-20'
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
#
# Please send patches to <config-patches@gnu.org>.
@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
Output the configuration name of the system \`$me' is run on.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
dummy=$tmp/dummy ;
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
+ ,,) echo "int x;" > "$dummy.c" ;
for c in cc gcc c89 c99 ; do
- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+ if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
@@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-case "${UNAME_SYSTEM}" in
+case "$UNAME_SYSTEM" in
Linux|GNU|GNU/*)
# If the system lacks a compiler, then just pick glibc.
# We could probably try harder.
LIBC=gnu
- eval $set_cc_for_build
- cat <<-EOF > $dummy.c
+ eval "$set_cc_for_build"
+ cat <<-EOF > "$dummy.c"
#include <features.h>
#if defined(__UCLIBC__)
LIBC=uclibc
@@ -149,13 +149,20 @@ Linux|GNU|GNU/*)
LIBC=gnu
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+
+ # If ldd exists, use it to detect musl libc.
+ if command -v ldd >/dev/null && \
+ ldd --version 2>&1 | grep -q ^musl
+ then
+ LIBC=musl
+ fi
;;
esac
# Note: order is significant - the case branches are not exclusive.
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -169,27 +176,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
- /sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || \
+ "/sbin/$sysctl" 2>/dev/null || \
+ "/usr/sbin/$sysctl" 2>/dev/null || \
echo unknown)`
- case "${UNAME_MACHINE_ARCH}" in
+ case "$UNAME_MACHINE_ARCH" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
earmv*)
- arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
- endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
- machine=${arch}${endian}-unknown
+ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
+ machine="${arch}${endian}"-unknown
;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
esac
# The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
- case "${UNAME_MACHINE_ARCH}" in
- arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
+ # to ELF recently (or will in the future) and ABI.
+ case "$UNAME_MACHINE_ARCH" in
+ earm*)
+ os=netbsdelf
+ ;;
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ eval "$set_cc_for_build"
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ELF__
then
@@ -205,10 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
;;
esac
# Determine ABI tags.
- case "${UNAME_MACHINE_ARCH}" in
+ case "$UNAME_MACHINE_ARCH" in
earm*)
expr='s/^earmv[0-9]/-eabi/;s/eb$//'
- abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
;;
esac
# The OS release
@@ -216,42 +226,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# thus, need a distinct triplet. However, they do not need
# kernel version information, so it can be replaced with a
# suitable tag, in the style of linux-gnu.
- case "${UNAME_VERSION}" in
+ case "$UNAME_VERSION" in
Debian*)
release='-gnu'
;;
*)
- release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}${abi}"
+ echo "$machine-${os}${release}${abi}"
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
+ exit ;;
+ *:LibertyBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+ echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
+ exit ;;
+ *:MidnightBSD:*:*)
+ echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
exit ;;
*:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
exit ;;
*:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
exit ;;
macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
exit ;;
*:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
exit ;;
*:Sortix:*:*)
- echo ${UNAME_MACHINE}-unknown-sortix
+ echo "$UNAME_MACHINE"-unknown-sortix
exit ;;
+ *:Redox:*:*)
+ echo "$UNAME_MACHINE"-unknown-redox
+ exit ;;
+ mips:OSF1:*.*)
+ echo mips-dec-osf1
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -268,63 +291,54 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
case "$ALPHA_CPU_TYPE" in
"EV4 (21064)")
- UNAME_MACHINE="alpha" ;;
+ UNAME_MACHINE=alpha ;;
"EV4.5 (21064)")
- UNAME_MACHINE="alpha" ;;
+ UNAME_MACHINE=alpha ;;
"LCA4 (21066/21068)")
- UNAME_MACHINE="alpha" ;;
+ UNAME_MACHINE=alpha ;;
"EV5 (21164)")
- UNAME_MACHINE="alphaev5" ;;
+ UNAME_MACHINE=alphaev5 ;;
"EV5.6 (21164A)")
- UNAME_MACHINE="alphaev56" ;;
+ UNAME_MACHINE=alphaev56 ;;
"EV5.6 (21164PC)")
- UNAME_MACHINE="alphapca56" ;;
+ UNAME_MACHINE=alphapca56 ;;
"EV5.7 (21164PC)")
- UNAME_MACHINE="alphapca57" ;;
+ UNAME_MACHINE=alphapca57 ;;
"EV6 (21264)")
- UNAME_MACHINE="alphaev6" ;;
+ UNAME_MACHINE=alphaev6 ;;
"EV6.7 (21264A)")
- UNAME_MACHINE="alphaev67" ;;
+ UNAME_MACHINE=alphaev67 ;;
"EV6.8CB (21264C)")
- UNAME_MACHINE="alphaev68" ;;
+ UNAME_MACHINE=alphaev68 ;;
"EV6.8AL (21264B)")
- UNAME_MACHINE="alphaev68" ;;
+ UNAME_MACHINE=alphaev68 ;;
"EV6.8CX (21264D)")
- UNAME_MACHINE="alphaev68" ;;
+ UNAME_MACHINE=alphaev68 ;;
"EV6.9A (21264/EV69A)")
- UNAME_MACHINE="alphaev69" ;;
+ UNAME_MACHINE=alphaev69 ;;
"EV7 (21364)")
- UNAME_MACHINE="alphaev7" ;;
+ UNAME_MACHINE=alphaev7 ;;
"EV7.9 (21364A)")
- UNAME_MACHINE="alphaev79" ;;
+ UNAME_MACHINE=alphaev79 ;;
esac
# A Pn.n version is a patched version.
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
exitcode=$?
trap '' 0
exit $exitcode ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
- # of the specific Alpha model?
- echo alpha-pc-interix
- exit ;;
- 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
- exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos
+ echo "$UNAME_MACHINE"-unknown-amigaos
exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-morphos
+ echo "$UNAME_MACHINE"-unknown-morphos
exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
@@ -336,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
+ echo arm-acorn-riscix"$UNAME_RELEASE"
exit ;;
arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
@@ -363,38 +377,38 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
s390x:SunOS:*:*)
- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
exit ;;
sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
exit ;;
i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
- echo i386-pc-auroraux${UNAME_RELEASE}
+ echo i386-pc-auroraux"$UNAME_RELEASE"
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- eval $set_cc_for_build
- SUN_ARCH="i386"
+ eval "$set_cc_for_build"
+ SUN_ARCH=i386
# If there is a compiler, see if it is configured for 64-bit objects.
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
# This test works for both compilers.
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
- SUN_ARCH="x86_64"
+ SUN_ARCH=x86_64
fi
fi
- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
@@ -403,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
;;
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+ echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
exit ;;
sun3*:SunOS:*:*)
- echo m68k-sun-sunos${UNAME_RELEASE}
+ echo m68k-sun-sunos"$UNAME_RELEASE"
exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
- echo m68k-sun-sunos${UNAME_RELEASE}
+ echo m68k-sun-sunos"$UNAME_RELEASE"
;;
sun4)
- echo sparc-sun-sunos${UNAME_RELEASE}
+ echo sparc-sun-sunos"$UNAME_RELEASE"
;;
esac
exit ;;
aushp:SunOS:*:*)
- echo sparc-auspex-sunos${UNAME_RELEASE}
+ echo sparc-auspex-sunos"$UNAME_RELEASE"
exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
@@ -432,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint"$UNAME_RELEASE"
exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint"$UNAME_RELEASE"
exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint"$UNAME_RELEASE"
exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
+ echo m68k-milan-mint"$UNAME_RELEASE"
exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
+ echo m68k-hades-mint"$UNAME_RELEASE"
exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
+ echo m68k-unknown-mint"$UNAME_RELEASE"
exit ;;
m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
+ echo m68k-apple-machten"$UNAME_RELEASE"
exit ;;
powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
+ echo powerpc-apple-machten"$UNAME_RELEASE"
exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
exit ;;
RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix${UNAME_RELEASE}
+ echo mips-dec-ultrix"$UNAME_RELEASE"
exit ;;
VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
+ echo vax-dec-ultrix"$UNAME_RELEASE"
exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix${UNAME_RELEASE}
+ echo clipper-intergraph-clix"$UNAME_RELEASE"
exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#ifdef __cplusplus
#include <stdio.h> /* for printf() prototype */
int main (int argc, char *argv[]) {
@@ -478,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
#endif
#if defined (host_mips) && defined (MIPSEB)
#if defined (SYSTYPE_SYSV)
- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_SVR4)
- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
#endif
#endif
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c &&
- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
- SYSTEM_NAME=`$dummy $dummyarg` &&
+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
{ echo "$SYSTEM_NAME"; exit; }
- echo mips-mips-riscos${UNAME_RELEASE}
+ echo mips-mips-riscos"$UNAME_RELEASE"
exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
@@ -520,17 +534,17 @@ EOF
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
- [ ${TARGET_BINARY_INTERFACE}x = x ]
+ if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
+ [ "$TARGET_BINARY_INTERFACE"x = x ]
then
- echo m88k-dg-dgux${UNAME_RELEASE}
+ echo m88k-dg-dgux"$UNAME_RELEASE"
else
- echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ echo m88k-dg-dguxbcs"$UNAME_RELEASE"
fi
else
- echo i586-dg-dgux${UNAME_RELEASE}
+ echo i586-dg-dgux"$UNAME_RELEASE"
fi
exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
@@ -547,7 +561,7 @@ EOF
echo m68k-tektronix-bsd
exit ;;
*:IRIX*:*:*)
- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+ echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
@@ -559,14 +573,14 @@ EOF
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
fi
- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#include <sys/systemcfg.h>
main()
@@ -577,7 +591,7 @@ EOF
exit(0);
}
EOF
- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
then
echo "$SYSTEM_NAME"
else
@@ -591,7 +605,7 @@ EOF
exit ;;
*:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
IBM_ARCH=powerpc
@@ -600,18 +614,18 @@ EOF
IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
fi
- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
exit ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
echo romp-ibm-bsd4.4
exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+ echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
@@ -626,28 +640,28 @@ EOF
echo m68k-hp-bsd4.4
exit ;;
9000/[34678]??:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- case "${UNAME_MACHINE}" in
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+ case "$UNAME_MACHINE" in
+ 9000/31?) HP_ARCH=m68000 ;;
+ 9000/[34]??) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ case "$sc_cpu_version" in
+ 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
+ case "$sc_kernel_bits" in
+ 32) HP_ARCH=hppa2.0n ;;
+ 64) HP_ARCH=hppa2.0w ;;
+ '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
esac ;;
esac
fi
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ if [ "$HP_ARCH" = "" ]; then
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#define _HPUX_SOURCE
#include <stdlib.h>
@@ -680,13 +694,13 @@ EOF
exit (0);
}
EOF
- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;;
esac
- if [ ${HP_ARCH} = "hppa2.0w" ]
+ if [ "$HP_ARCH" = hppa2.0w ]
then
- eval $set_cc_for_build
+ eval "$set_cc_for_build"
# hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
# 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
@@ -697,23 +711,23 @@ EOF
# $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
# => hppa64-hp-hpux11.23
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
grep -q __LP64__
then
- HP_ARCH="hppa2.0w"
+ HP_ARCH=hppa2.0w
else
- HP_ARCH="hppa64"
+ HP_ARCH=hppa64
fi
fi
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
exit ;;
ia64:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- echo ia64-hp-hpux${HPUX_REV}
+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux"$HPUX_REV"
exit ;;
3050*:HI-UX:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#include <unistd.h>
int
main ()
@@ -738,11 +752,11 @@ EOF
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
{ echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
exit ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
echo hppa1.1-hp-bsd
exit ;;
9000/8??:4.3bsd:*:*)
@@ -751,7 +765,7 @@ EOF
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
exit ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
echo hppa1.1-hp-osf
exit ;;
hp8??:OSF1:*:*)
@@ -759,9 +773,9 @@ EOF
exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk
+ echo "$UNAME_MACHINE"-unknown-osf1mk
else
- echo ${UNAME_MACHINE}-unknown-osf1
+ echo "$UNAME_MACHINE"-unknown-osf1
fi
exit ;;
parisc*:Lites*:*:*)
@@ -786,127 +800,109 @@ EOF
echo c4-convex-bsd
exit ;;
CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*[A-Z]90:*:*:*)
- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
exit ;;
CRAY*TS:*:*:*)
- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*T3E:*:*:*)
- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*SV1:*:*:*)
- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
*:UNICOS/mp:*:*)
- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+ FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+ FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
exit ;;
sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi${UNAME_RELEASE}
+ echo sparc-unknown-bsdi"$UNAME_RELEASE"
exit ;;
*:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
exit ;;
*:FreeBSD:*:*)
UNAME_PROCESSOR=`/usr/bin/uname -p`
- case ${UNAME_PROCESSOR} in
+ case "$UNAME_PROCESSOR" in
amd64)
- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ UNAME_PROCESSOR=x86_64 ;;
+ i386)
+ UNAME_PROCESSOR=i586 ;;
esac
+ echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
exit ;;
i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
+ echo "$UNAME_MACHINE"-pc-cygwin
exit ;;
*:MINGW64*:*)
- echo ${UNAME_MACHINE}-pc-mingw64
+ echo "$UNAME_MACHINE"-pc-mingw64
exit ;;
*:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
+ echo "$UNAME_MACHINE"-pc-mingw32
exit ;;
*:MSYS*:*)
- echo ${UNAME_MACHINE}-pc-msys
- exit ;;
- i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
+ echo "$UNAME_MACHINE"-pc-msys
exit ;;
i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
+ echo "$UNAME_MACHINE"-pc-pw32
exit ;;
*:Interix*:*)
- case ${UNAME_MACHINE} in
+ case "$UNAME_MACHINE" in
x86)
- echo i586-pc-interix${UNAME_RELEASE}
+ echo i586-pc-interix"$UNAME_RELEASE"
exit ;;
authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix${UNAME_RELEASE}
+ echo x86_64-unknown-interix"$UNAME_RELEASE"
exit ;;
IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
+ echo ia64-unknown-interix"$UNAME_RELEASE"
exit ;;
esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
- 8664:Windows_NT:*)
- echo x86_64-pc-mks
- exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- # UNAME_MACHINE based on the output of uname instead of i386?
- echo i586-pc-interix
- exit ;;
i*:UWIN*:*)
- echo ${UNAME_MACHINE}-pc-uwin
+ echo "$UNAME_MACHINE"-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
- p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin
- exit ;;
prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
exit ;;
i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
+ echo "$UNAME_MACHINE"-pc-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -919,61 +915,64 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
arc:Linux:*:* | arceb:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
arm*:Linux:*:*)
- eval $set_cc_for_build
+ eval "$set_cc_for_build"
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
else
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
exit ;;
crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
exit ;;
e2k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
i*86:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ k1om:Linux:*:*)
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#undef CPU
#undef ${UNAME_MACHINE}
#undef ${UNAME_MACHINE}el
@@ -987,64 +986,74 @@ EOF
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
+ test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
;;
+ mips64el:Linux:*:*)
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
openrisc*:Linux:*:*)
- echo or1k-unknown-linux-${LIBC}
+ echo or1k-unknown-linux-"$LIBC"
exit ;;
or32:Linux:*:* | or1k*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-${LIBC}
+ echo sparc-unknown-linux-"$LIBC"
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-${LIBC}
+ echo hppa64-unknown-linux-"$LIBC"
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
- *) echo hppa-unknown-linux-${LIBC} ;;
+ PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
+ PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
+ *) echo hppa-unknown-linux-"$LIBC" ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-${LIBC}
+ echo powerpc64-unknown-linux-"$LIBC"
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-${LIBC}
+ echo powerpc-unknown-linux-"$LIBC"
exit ;;
ppc64le:Linux:*:*)
- echo powerpc64le-unknown-linux-${LIBC}
+ echo powerpc64le-unknown-linux-"$LIBC"
exit ;;
ppcle:Linux:*:*)
- echo powerpcle-unknown-linux-${LIBC}
+ echo powerpcle-unknown-linux-"$LIBC"
+ exit ;;
+ riscv32:Linux:*:* | riscv64:Linux:*:*)
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ if objdump -f /bin/sh | grep -q elf32-x86-64; then
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
+ else
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+ fi
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1058,34 +1067,34 @@ EOF
# I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
exit ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
+ echo "$UNAME_MACHINE"-pc-os2-emx
exit ;;
i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
+ echo "$UNAME_MACHINE"-unknown-stop
exit ;;
i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
+ echo "$UNAME_MACHINE"-unknown-atheos
exit ;;
i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
+ echo "$UNAME_MACHINE"-pc-syllable
exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
+ echo i386-unknown-lynxos"$UNAME_RELEASE"
exit ;;
i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ echo "$UNAME_MACHINE"-pc-msdosdjgpp
exit ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ i*86:*:4.*:*)
+ UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
fi
exit ;;
i*86:*:5:[678]*)
@@ -1095,12 +1104,12 @@ EOF
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
elif /bin/uname -X 2>/dev/null >/dev/null ; then
UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -1110,9 +1119,9 @@ EOF
&& UNAME_MACHINE=i686
(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
else
- echo ${UNAME_MACHINE}-pc-sysv32
+ echo "$UNAME_MACHINE"-pc-sysv32
fi
exit ;;
pc:*:*:*)
@@ -1120,7 +1129,7 @@ EOF
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
- # prints for the "djgpp" host, or else GDB configury will decide that
+ # prints for the "djgpp" host, or else GDB configure will decide that
# this is a cross-build.
echo i586-pc-msdosdjgpp
exit ;;
@@ -1132,9 +1141,9 @@ EOF
exit ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
fi
exit ;;
mini*:CTIX:SYS*5:*)
@@ -1154,9 +1163,9 @@ EOF
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4; exit; } ;;
@@ -1165,28 +1174,28 @@ EOF
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
+ echo m68k-unknown-lynxos"$UNAME_RELEASE"
exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit ;;
TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
+ echo sparc-unknown-lynxos"$UNAME_RELEASE"
exit ;;
rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ echo rs6000-unknown-lynxos"$UNAME_RELEASE"
exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ echo powerpc-unknown-lynxos"$UNAME_RELEASE"
exit ;;
SM[BE]S:UNIX_SV:*:*)
- echo mips-dde-sysv${UNAME_RELEASE}
+ echo mips-dde-sysv"$UNAME_RELEASE"
exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
@@ -1197,7 +1206,7 @@ EOF
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
- echo ${UNAME_MACHINE}-sni-sysv4
+ echo "$UNAME_MACHINE"-sni-sysv4
else
echo ns32k-sni-sysv
fi
@@ -1217,23 +1226,23 @@ EOF
exit ;;
i*86:VOS:*:*)
# From Paul.Green@stratus.com.
- echo ${UNAME_MACHINE}-stratus-vos
+ echo "$UNAME_MACHINE"-stratus-vos
exit ;;
*:VOS:*:*)
# From Paul.Green@stratus.com.
echo hppa1.1-stratus-vos
exit ;;
mc68*:A/UX:*:*)
- echo m68k-apple-aux${UNAME_RELEASE}
+ echo m68k-apple-aux"$UNAME_RELEASE"
exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
+ echo mips-nec-sysv"$UNAME_RELEASE"
else
- echo mips-unknown-sysv${UNAME_RELEASE}
+ echo mips-unknown-sysv"$UNAME_RELEASE"
fi
exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
@@ -1252,46 +1261,56 @@ EOF
echo x86_64-unknown-haiku
exit ;;
SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
+ echo sx4-nec-superux"$UNAME_RELEASE"
exit ;;
SX-5:SUPER-UX:*:*)
- echo sx5-nec-superux${UNAME_RELEASE}
+ echo sx5-nec-superux"$UNAME_RELEASE"
exit ;;
SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
+ echo sx6-nec-superux"$UNAME_RELEASE"
exit ;;
SX-7:SUPER-UX:*:*)
- echo sx7-nec-superux${UNAME_RELEASE}
+ echo sx7-nec-superux"$UNAME_RELEASE"
exit ;;
SX-8:SUPER-UX:*:*)
- echo sx8-nec-superux${UNAME_RELEASE}
+ echo sx8-nec-superux"$UNAME_RELEASE"
exit ;;
SX-8R:SUPER-UX:*:*)
- echo sx8r-nec-superux${UNAME_RELEASE}
+ echo sx8r-nec-superux"$UNAME_RELEASE"
+ exit ;;
+ SX-ACE:SUPER-UX:*:*)
+ echo sxace-nec-superux"$UNAME_RELEASE"
exit ;;
Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ echo powerpc-apple-rhapsody"$UNAME_RELEASE"
exit ;;
*:Rhapsody:*:*)
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- eval $set_cc_for_build
+ eval "$set_cc_for_build"
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
- if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
+ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
powerpc) UNAME_PROCESSOR=powerpc64 ;;
esac
fi
+ # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+ if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_PPC >/dev/null
+ then
+ UNAME_PROCESSOR=powerpc
+ fi
fi
elif test "$UNAME_PROCESSOR" = i386 ; then
# Avoid executing cc on OS X 10.9, as it ships with a stub
@@ -1302,27 +1321,33 @@ EOF
# that Apple uses in portable devices.
UNAME_PROCESSOR=x86_64
fi
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
- if test "$UNAME_PROCESSOR" = "x86"; then
+ if test "$UNAME_PROCESSOR" = x86; then
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+ echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
- NEO-?:NONSTOP_KERNEL:*:*)
- echo neo-tandem-nsk${UNAME_RELEASE}
+ NEO-*:NONSTOP_KERNEL:*:*)
+ echo neo-tandem-nsk"$UNAME_RELEASE"
exit ;;
NSE-*:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk${UNAME_RELEASE}
+ echo nse-tandem-nsk"$UNAME_RELEASE"
+ exit ;;
+ NSR-*:NONSTOP_KERNEL:*:*)
+ echo nsr-tandem-nsk"$UNAME_RELEASE"
exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
- echo nsr-tandem-nsk${UNAME_RELEASE}
+ NSV-*:NONSTOP_KERNEL:*:*)
+ echo nsv-tandem-nsk"$UNAME_RELEASE"
+ exit ;;
+ NSX-*:NONSTOP_KERNEL:*:*)
+ echo nsx-tandem-nsk"$UNAME_RELEASE"
exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
@@ -1331,18 +1356,18 @@ EOF
echo bs2000-siemens-sysv
exit ;;
DS/*:UNIX_System_V:*:*)
- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
# operating systems.
- if test "$cputype" = "386"; then
+ if test "$cputype" = 386; then
UNAME_MACHINE=i386
else
UNAME_MACHINE="$cputype"
fi
- echo ${UNAME_MACHINE}-unknown-plan9
+ echo "$UNAME_MACHINE"-unknown-plan9
exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
@@ -1363,14 +1388,14 @@ EOF
echo pdp10-unknown-its
exit ;;
SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
+ echo mips-sei-seiux"$UNAME_RELEASE"
exit ;;
*:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
exit ;;
*:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
- case "${UNAME_MACHINE}" in
+ case "$UNAME_MACHINE" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
V*) echo vax-dec-vms ; exit ;;
@@ -1379,34 +1404,48 @@ EOF
echo i386-pc-xenix
exit ;;
i*86:skyos:*:*)
- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+ echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
exit ;;
i*86:rdos:*:*)
- echo ${UNAME_MACHINE}-pc-rdos
+ echo "$UNAME_MACHINE"-pc-rdos
exit ;;
i*86:AROS:*:*)
- echo ${UNAME_MACHINE}-pc-aros
+ echo "$UNAME_MACHINE"-pc-aros
exit ;;
x86_64:VMkernel:*:*)
- echo ${UNAME_MACHINE}-unknown-esx
+ echo "$UNAME_MACHINE"-unknown-esx
+ exit ;;
+ amd64:Isilon\ OneFS:*:*)
+ echo x86_64-unknown-onefs
exit ;;
esac
+echo "$0: unable to guess system type" >&2
+
+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
+ mips:Linux | mips64:Linux)
+ # If we got here on MIPS GNU/Linux, output extra information.
+ cat >&2 <<EOF
+
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
+the system type. Please install a C compiler and try again.
+EOF
+ ;;
+esac
+
cat >&2 <<EOF
-$0: unable to guess system type
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite *all*
+copies of config.guess and config.sub with the latest versions from:
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
and
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
config.guess timestamp = $timestamp
@@ -1425,16 +1464,16 @@ hostinfo = `(hostinfo) 2>/dev/null`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
+UNAME_MACHINE = "$UNAME_MACHINE"
+UNAME_RELEASE = "$UNAME_RELEASE"
+UNAME_SYSTEM = "$UNAME_SYSTEM"
+UNAME_VERSION = "$UNAME_VERSION"
EOF
exit 1
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
diff --git a/config.h.in b/config.h.in
index 9723687..e9e3dce 100644
--- a/config.h.in
+++ b/config.h.in
@@ -19,9 +19,6 @@
/* Define to 1 if you have the `fprintf' function. */
#undef HAVE_FPRINTF
-/* Define to 1 if you have the <gnutls/gnutls.h> header file. */
-#undef HAVE_GNUTLS_GNUTLS_H
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/config.sub b/config.sub
index 1acc966..1d8e98b 100755
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2015 Free Software Foundation, Inc.
+# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2015-08-20'
+timestamp='2018-02-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2015-08-20'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,7 +33,7 @@ timestamp='2015-08-20'
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
@@ -53,12 +53,11 @@ timestamp='2015-08-20'
me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
- $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
Canonicalize a configuration name.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -95,7 +94,7 @@ while test $# -gt 0 ; do
*local*)
# First pass through any local machine types.
- echo $1
+ echo "$1"
exit ;;
* )
@@ -113,24 +112,24 @@ esac
# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
- kopensolaris*-gnu* | \
+ kopensolaris*-gnu* | cloudabi*-eabi* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
android-linux)
os=-linux-android
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
;;
*)
- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
- if [ $basic_machine != $1 ]
- then os=`echo $1 | sed 's/.*-/-/'`
+ basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
+ if [ "$basic_machine" != "$1" ]
+ then os=`echo "$1" | sed 's/.*-/-/'`
else os=; fi
;;
esac
@@ -179,44 +178,44 @@ case $os in
;;
-sco6)
os=-sco5v6
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco5)
os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco4)
os=-sco3.2v4
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco3.2.[4-9]*)
os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco3.2v[4-9]*)
# Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco5v6*)
# Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco*)
os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-udk*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-isc)
os=-isc2.2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-clix*)
basic_machine=clipper-intergraph
;;
-isc*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-lynx*178)
os=-lynxos178
@@ -228,10 +227,7 @@ case $os in
os=-lynxos
;;
-ptx*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
- ;;
- -windowsnt*)
- os=`echo $os | sed -e 's/windowsnt/winnt/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
;;
-psos*)
os=-psos
@@ -264,7 +260,7 @@ case $basic_machine in
| fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
- | i370 | i860 | i960 | ia64 \
+ | i370 | i860 | i960 | ia16 | ia64 \
| ip2k | iq2000 \
| k1om \
| le32 | le64 \
@@ -300,8 +296,9 @@ case $basic_machine in
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
| open8 | or1k | or1knd | or32 \
- | pdp10 | pdp11 | pj | pjl \
+ | pdp10 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pru \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
@@ -315,7 +312,7 @@ case $basic_machine in
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
- | we32k \
+ | wasm32 \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
@@ -336,7 +333,7 @@ case $basic_machine in
basic_machine=$basic_machine-unknown
os=-none
;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
;;
ms1)
basic_machine=mt-unknown
@@ -365,7 +362,7 @@ case $basic_machine in
;;
# Object if more than one company name word.
*-*-*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
exit 1
;;
# Recognize the basic CPU types with company name.
@@ -388,7 +385,7 @@ case $basic_machine in
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| hexagon-* \
- | i*86-* | i860-* | i960-* | ia64-* \
+ | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
| ip2k-* | iq2000-* \
| k1om-* \
| le32-* | le64-* \
@@ -429,6 +426,7 @@ case $basic_machine in
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pru-* \
| pyramid-* \
| riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
@@ -445,6 +443,7 @@ case $basic_machine in
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
| visium-* \
+ | wasm32-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -458,7 +457,7 @@ case $basic_machine in
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
- basic_machine=i386-unknown
+ basic_machine=i386-pc
os=-bsd
;;
3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@@ -492,7 +491,7 @@ case $basic_machine in
basic_machine=x86_64-pc
;;
amd64-*)
- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
amdahl)
basic_machine=580-amdahl
@@ -521,7 +520,7 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
- asmjs)
+ asmjs)
basic_machine=asmjs-unknown
;;
aux)
@@ -537,7 +536,7 @@ case $basic_machine in
os=-linux
;;
blackfin-*)
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=-linux
;;
bluegene*)
@@ -545,13 +544,13 @@ case $basic_machine in
os=-cnk
;;
c54x-*)
- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
c55x-*)
- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
c6x-*)
- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
c90)
basic_machine=c90-cray
@@ -640,10 +639,18 @@ case $basic_machine in
basic_machine=rs6000-bull
os=-bosx
;;
- dpx2* | dpx2*-bull)
+ dpx2*)
basic_machine=m68k-bull
os=-sysv3
;;
+ e500v[12])
+ basic_machine=powerpc-unknown
+ os=$os"spe"
+ ;;
+ e500v[12]-*)
+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ os=$os"spe"
+ ;;
ebmon29k)
basic_machine=a29k-amd
os=-ebmon
@@ -733,9 +740,6 @@ case $basic_machine in
hp9k8[0-9][0-9] | hp8[0-9][0-9])
basic_machine=hppa1.0-hp
;;
- hppa-next)
- os=-nextstep3
- ;;
hppaosf)
basic_machine=hppa1.1-hp
os=-osf
@@ -748,26 +752,26 @@ case $basic_machine in
basic_machine=i370-ibm
;;
i*86v32)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-sysv32
;;
i*86v4*)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-sysv4
;;
i*86v)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-sysv
;;
i*86sol2)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-solaris2
;;
i386mach)
basic_machine=i386-mach
os=-mach
;;
- i386-vsta | vsta)
+ vsta)
basic_machine=i386-unknown
os=-vsta
;;
@@ -786,19 +790,16 @@ case $basic_machine in
os=-sysv
;;
leon-*|leon[3-9]-*)
- basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+ basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
;;
m68knommu-*)
- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=-linux
;;
- m88k-omron*)
- basic_machine=m88k-omron
- ;;
magnum | m3230)
basic_machine=mips-mips
os=-sysv
@@ -830,10 +831,10 @@ case $basic_machine in
os=-mint
;;
mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
;;
mips3*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
;;
monitor)
basic_machine=m68k-rom68k
@@ -852,7 +853,7 @@ case $basic_machine in
os=-msdos
;;
ms1-*)
- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
;;
msys)
basic_machine=i686-pc
@@ -894,7 +895,7 @@ case $basic_machine in
basic_machine=v70-nec
os=-sysv
;;
- next | m*-next )
+ next | m*-next)
basic_machine=m68k-next
case $os in
-nextstep* )
@@ -939,6 +940,12 @@ case $basic_machine in
nsr-tandem)
basic_machine=nsr-tandem
;;
+ nsv-tandem)
+ basic_machine=nsv-tandem
+ ;;
+ nsx-tandem)
+ basic_machine=nsx-tandem
+ ;;
op50n-* | op60c-*)
basic_machine=hppa1.1-oki
os=-proelf
@@ -971,7 +978,7 @@ case $basic_machine in
os=-linux
;;
parisc-*)
- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=-linux
;;
pbd)
@@ -987,7 +994,7 @@ case $basic_machine in
basic_machine=i386-pc
;;
pc98-*)
- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
@@ -1002,16 +1009,16 @@ case $basic_machine in
basic_machine=i786-pc
;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-* | 6x86-* | athlon-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentium4-*)
- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pn)
basic_machine=pn-gould
@@ -1021,23 +1028,23 @@ case $basic_machine in
ppc | ppcbe) basic_machine=powerpc-unknown
;;
ppc-* | ppcbe-*)
- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
+ ppcle | powerpclittle)
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
ppc64) basic_machine=powerpc64-unknown
;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
ps2)
basic_machine=i386-ibm
@@ -1091,17 +1098,10 @@ case $basic_machine in
sequent)
basic_machine=i386-sequent
;;
- sh)
- basic_machine=sh-hitachi
- os=-hms
- ;;
sh5el)
basic_machine=sh5le-unknown
;;
- sh64)
- basic_machine=sh64-unknown
- ;;
- sparclite-wrs | simso-wrs)
+ simso-wrs)
basic_machine=sparclite-wrs
os=-vxworks
;;
@@ -1120,7 +1120,7 @@ case $basic_machine in
os=-sysv4
;;
strongarm-* | thumb-*)
- basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
sun2)
basic_machine=m68000-sun
@@ -1242,6 +1242,9 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
+ x64)
+ basic_machine=x86_64-pc
+ ;;
xbox)
basic_machine=i686-pc
os=-mingw32
@@ -1250,20 +1253,12 @@ case $basic_machine in
basic_machine=xps100-honeywell
;;
xscale-* | xscalee[bl]-*)
- basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
;;
ymp)
basic_machine=ymp-cray
os=-unicos
;;
- z8k-*-coff)
- basic_machine=z8k-unknown
- os=-sim
- ;;
- z80-*-coff)
- basic_machine=z80-unknown
- os=-sim
- ;;
none)
basic_machine=none-none
os=-none
@@ -1292,10 +1287,6 @@ case $basic_machine in
vax)
basic_machine=vax-dec
;;
- pdp10)
- # there are many clones, so DEC is not a safe bet
- basic_machine=pdp10-unknown
- ;;
pdp11)
basic_machine=pdp11-dec
;;
@@ -1305,9 +1296,6 @@ case $basic_machine in
sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- basic_machine=sparc-sun
- ;;
cydra)
basic_machine=cydra-cydrome
;;
@@ -1327,7 +1315,7 @@ case $basic_machine in
# Make sure to match an already-canonicalized machine name.
;;
*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
exit 1
;;
esac
@@ -1335,10 +1323,10 @@ esac
# Here we canonicalize certain aliases for manufacturers.
case $basic_machine in
*-digital*)
- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+ basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
;;
*-commodore*)
- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+ basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
;;
*)
;;
@@ -1349,8 +1337,8 @@ esac
if [ x"$os" != x"" ]
then
case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
+ # First match some system type aliases that might get confused
+ # with valid system types.
# -solaris* is a basic system type, with this one exception.
-auroraux)
os=-auroraux
@@ -1361,18 +1349,19 @@ case $os in
-solaris)
os=-solaris2
;;
- -svr4*)
- os=-sysv4
- ;;
-unixware*)
os=-sysv4.2uw
;;
-gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
;;
- # First accept the basic system types.
+ # es1800 is here to avoid being matched by es* (a different OS)
+ -es1800*)
+ os=-ose
+ ;;
+ # Now accept the basic system types.
# The portable systems comes first.
- # Each alternative MUST END IN A *, to match a version number.
+ # Each alternative MUST end in a * to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
@@ -1382,24 +1371,26 @@ case $os in
| -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -bitrig* | -openbsd* | -solidbsd* \
+ | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
+ | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
+ | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -morphos* | -superux* | -rtmk* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+ | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
+ | -midnightbsd*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1416,12 +1407,12 @@ case $os in
-nto*)
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+ -sim | -xray | -os68k* | -v88r* \
+ | -windows* | -osx | -abug | -netware* | -os9* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
- os=`echo $os | sed -e 's|mac|macos|'`
+ os=`echo "$os" | sed -e 's|mac|macos|'`
;;
-linux-dietlibc)
os=-linux-dietlibc
@@ -1430,10 +1421,10 @@ case $os in
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
-sunos5*)
- os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
;;
-sunos6*)
- os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
;;
-opened*)
os=-openedition
@@ -1444,12 +1435,6 @@ case $os in
-wince*)
os=-wince
;;
- -osfrose*)
- os=-osfrose
- ;;
- -osf*)
- os=-osf
- ;;
-utek*)
os=-bsd
;;
@@ -1474,7 +1459,7 @@ case $os in
-nova*)
os=-rtmk-nova
;;
- -ns2 )
+ -ns2)
os=-nextstep2
;;
-nsk*)
@@ -1496,7 +1481,7 @@ case $os in
-oss*)
os=-sysv3
;;
- -svr4)
+ -svr4*)
os=-sysv4
;;
-svr3)
@@ -1511,32 +1496,38 @@ case $os in
-ose*)
os=-ose
;;
- -es1800*)
- os=-ose
- ;;
- -xenix)
- os=-xenix
- ;;
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
os=-mint
;;
- -aros*)
- os=-aros
- ;;
-zvmoe)
os=-zvmoe
;;
-dicos*)
os=-dicos
;;
+ -pikeos*)
+ # Until real need of OS specific support for
+ # particular features comes up, bare metal
+ # configurations are quite functional.
+ case $basic_machine in
+ arm*)
+ os=-eabi
+ ;;
+ *)
+ os=-elf
+ ;;
+ esac
+ ;;
-nacl*)
;;
+ -ios)
+ ;;
-none)
;;
*)
# Get rid of the `-' at the beginning of $os.
os=`echo $os | sed 's/[^-]*-//'`
- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+ echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
exit 1
;;
esac
@@ -1626,12 +1617,12 @@ case $basic_machine in
sparc-* | *-sun)
os=-sunos4.1.1
;;
+ pru-*)
+ os=-elf
+ ;;
*-be)
os=-beos
;;
- *-haiku)
- os=-haiku
- ;;
*-ibm)
os=-aix
;;
@@ -1671,7 +1662,7 @@ case $basic_machine in
m88k-omron*)
os=-luna
;;
- *-next )
+ *-next)
os=-nextstep
;;
*-sequent)
@@ -1686,9 +1677,6 @@ case $basic_machine in
i370-*)
os=-mvs
;;
- *-next)
- os=-nextstep3
- ;;
*-gould)
os=-sysv
;;
@@ -1798,15 +1786,15 @@ case $basic_machine in
vendor=stratus
;;
esac
- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
;;
esac
-echo $basic_machine$os
+echo "$basic_machine$os"
exit
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
diff --git a/configure b/configure
index 7983e1c..aaeee32 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xmlsec1 1.2.25.
+# Generated by GNU Autoconf 2.69 for xmlsec1 1.2.26.
#
# Report bugs to <http://www.aleksey.com/xmlsec>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xmlsec1'
PACKAGE_TARNAME='xmlsec1'
-PACKAGE_VERSION='1.2.25'
-PACKAGE_STRING='xmlsec1 1.2.25'
+PACKAGE_VERSION='1.2.26'
+PACKAGE_STRING='xmlsec1 1.2.26'
PACKAGE_BUGREPORT='http://www.aleksey.com/xmlsec'
PACKAGE_URL=''
@@ -728,6 +728,12 @@ XMLSEC_NO_RIPEMD160_TRUE
XMLSEC_NO_MD5
XMLSEC_NO_MD5_FALSE
XMLSEC_NO_MD5_TRUE
+MSCNG_CRYPTO_LIB
+MSCNG_LIBS
+MSCNG_CFLAGS
+XMLSEC_NO_MSCNG
+XMLSEC_NO_MSCNG_FALSE
+XMLSEC_NO_MSCNG_TRUE
MSCRYPTO_CRYPTO_LIB
MSCRYPTO_LIBS
MSCRYPTO_CFLAGS
@@ -746,6 +752,7 @@ GCRYPT_CRYPTO_LIB
XMLSEC_NO_GCRYPT
XMLSEC_NO_GCRYPT_FALSE
XMLSEC_NO_GCRYPT_TRUE
+GCRYPT_CONFIG_PATH
GCRYPT_LIBS
GCRYPT_CFLAGS
MOZILLA_MIN_VERSION
@@ -759,6 +766,8 @@ XMLSEC_NO_NSS_FALSE
XMLSEC_NO_NSS_TRUE
NSS_LIBS
NSS_CFLAGS
+NSPR_LIBS
+NSPR_CFLAGS
OPENSSL_MIN_VERSION
OPENSSL_CRYPTO_LIB
XMLSEC_NO_OPENSSL
@@ -768,12 +777,14 @@ OPENSSL_LIBS
OPENSSL_CFLAGS
LIBXSLT_PC_FILE_COND
LIBXSLT_MIN_VERSION
-XMLSEC_NO_LIBXSLT
LIBXSLT_CONFIG
+XMLSEC_NO_LIBXSLT
+LIBXSLT_CONFIG_PATH
LIBXSLT_LIBS
LIBXSLT_CFLAGS
LIBXML_MIN_VERSION
LIBXML_CONFIG
+LIBXML_CONFIG_PATH
LIBXML_LIBS
LIBXML_CFLAGS
PKG_CONFIG_LIBDIR
@@ -783,20 +794,19 @@ BUILD_API_DOCS_FALSE
BUILD_API_DOCS_TRUE
BUILD_MAN_DOCS_FALSE
BUILD_MAN_DOCS_TRUE
+BUILD_MANPAGES_FALSE
+BUILD_MANPAGES_TRUE
HAS_XSLTPROC_FALSE
HAS_XSLTPROC_TRUE
HAS_MAN2HTML_FALSE
HAS_MAN2HTML_TRUE
+HAS_HELP2MAN_FALSE
+HAS_HELP2MAN_TRUE
GTKDOC_SCAN
GTKDOC_MKDB
-GTKDOC_MKTMPL
GTKDOC_MKHTML
MAN2HTML
XSLTPROC
-BUILD_MANPAGES_FALSE
-BUILD_MANPAGES_TRUE
-HAS_HELP2MAN_FALSE
-HAS_HELP2MAN_TRUE
HELP2MAN
PERL
TAR
@@ -945,6 +955,8 @@ enable_development
enable_manpages_build
enable_docs_build
enable_pkgconfig
+enable_custom_configs
+enable_folders_search
with_libxml
with_libxml_src
with_libxslt
@@ -957,6 +969,7 @@ with_mozilla_ver
with_gcrypt
with_gnutls
enable_mscrypto
+enable_mscng
with_default_crypto
enable_md5
enable_ripemd160
@@ -984,6 +997,7 @@ with_html_dir
enable_skm
enable_tmpl_tests
enable_debugging
+enable_werror
enable_profiling
enable_pedantic
'
@@ -1006,6 +1020,8 @@ LIBXSLT_CFLAGS
LIBXSLT_LIBS
OPENSSL_CFLAGS
OPENSSL_LIBS
+NSPR_CFLAGS
+NSPR_LIBS
NSS_CFLAGS
NSS_LIBS
GCRYPT_CFLAGS
@@ -1562,7 +1578,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xmlsec1 1.2.25 to adapt to many kinds of systems.
+\`configure' configures xmlsec1 1.2.26 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1633,7 +1649,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xmlsec1 1.2.25:";;
+ short | recursive ) echo "Configuration of xmlsec1 1.2.26:";;
esac
cat <<\_ACEOF
@@ -1658,8 +1674,11 @@ Optional Features:
--enable-development enable development environment (no)
--enable-manpages-build man pages build (no)
--enable-docs-build docs build (no)
- --enable-pkgconfig enable pkgconfig for configuration (yes)
- --enable-mscrypto enable mscrypto (no)
+ --enable-pkgconfig enable pkgconfig for configuration (yes)
+ --enable-custom-configs enable package-specific custom scripts for configuration (yes)
+ --enable-folders-search enable searching for package installation in typical folders (yes)
+ --enable-mscrypto enable mscrypto (no)
+ --enable-mscng enable mscng (no)
--enable-md5 enable MD5 support (yes)
--enable-ripemd160 enable RIPEMD-160 support (yes)
--enable-sha1 enable SHA1 support (yes)
@@ -1686,6 +1705,7 @@ Optional Features:
--enable-skm enable Simple Keys Manager testing (yes)
--enable-tmpl-tests enable templates testing in xmlsec utility (yes)
--enable-debugging enable debugging compilation flags (no)
+ --enable-werror handle warnings as errors (no)
--enable-profiling enable profiling compilation flags (no)
--enable-pedantic enable pedantic compilation flags (no)
@@ -1702,11 +1722,11 @@ Optional Packages:
compiler's sysroot if not specified).
--with-libxml=PFX libxml2 location
- --with-libxml-src=PFX not installed yet libxml2 location
+ --with-libxml-src=PFX libxml2 source tree location
--with-libxslt=PFX libxslt location
- --with-libxslt-src=PFX not installed yet libxslt location
+ --with-libxslt-src=PFX libxslt source tree location
--with-openssl=PFX openssl location
--with-nss=PFX nss location
@@ -1745,6 +1765,8 @@ Some influential environment variables:
C compiler flags for OPENSSL, overriding pkg-config
OPENSSL_LIBS
linker flags for OPENSSL, overriding pkg-config
+ NSPR_CFLAGS C compiler flags for NSPR, overriding pkg-config
+ NSPR_LIBS linker flags for NSPR, overriding pkg-config
NSS_CFLAGS C compiler flags for NSS, overriding pkg-config
NSS_LIBS linker flags for NSS, overriding pkg-config
GCRYPT_CFLAGS
@@ -1820,7 +1842,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xmlsec1 configure 1.2.25
+xmlsec1 configure 1.2.26
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2372,7 +2394,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xmlsec1 $as_me 1.2.25, which was
+It was created by xmlsec1 $as_me 1.2.26, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2724,12 +2746,18 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
XMLSEC_PACKAGE=xmlsec1
XMLSEC_VERSION_MAJOR=1
XMLSEC_VERSION_MINOR=2
-XMLSEC_VERSION_SUBMINOR=25
+XMLSEC_VERSION_SUBMINOR=26
XMLSEC_VERSION="$XMLSEC_VERSION_MAJOR.$XMLSEC_VERSION_MINOR.$XMLSEC_VERSION_SUBMINOR"
XMLSEC_VERSION_INFO=`echo $XMLSEC_VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
XMLSEC_VERSION_SAFE=`echo $XMLSEC_VERSION | sed 's/\./_/g'`
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -3326,7 +3354,7 @@ fi
# Define the identity of the package.
PACKAGE='xmlsec1'
- VERSION='1.2.25'
+ VERSION='1.2.26'
cat >>confdefs.h <<_ACEOF
@@ -12661,7 +12689,7 @@ CC=$lt_save_CC
-if test "z$RM" == "z" ; then
+if test "z$RM" = "z" ; then
# Extract the first word of "rm", so it can be a program name with args.
set dummy rm; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -12868,6 +12896,270 @@ fi
+# Extract the first word of "help2man", so it can be a program name with args.
+set dummy help2man; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_HELP2MAN+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $HELP2MAN in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_HELP2MAN="$HELP2MAN" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_HELP2MAN="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+HELP2MAN=$ac_cv_path_HELP2MAN
+if test -n "$HELP2MAN"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HELP2MAN" >&5
+$as_echo "$HELP2MAN" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "xsltproc", so it can be a program name with args.
+set dummy xsltproc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XSLTPROC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $XSLTPROC in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+XSLTPROC=$ac_cv_path_XSLTPROC
+if test -n "$XSLTPROC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
+$as_echo "$XSLTPROC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "man2html", so it can be a program name with args.
+set dummy man2html; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MAN2HTML+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $MAN2HTML in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MAN2HTML="$MAN2HTML" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_MAN2HTML="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+MAN2HTML=$ac_cv_path_MAN2HTML
+if test -n "$MAN2HTML"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAN2HTML" >&5
+$as_echo "$MAN2HTML" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "gtkdoc-mkhtml", so it can be a program name with args.
+set dummy gtkdoc-mkhtml; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GTKDOC_MKHTML+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GTKDOC_MKHTML in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GTKDOC_MKHTML="$GTKDOC_MKHTML" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_GTKDOC_MKHTML="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+GTKDOC_MKHTML=$ac_cv_path_GTKDOC_MKHTML
+if test -n "$GTKDOC_MKHTML"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKHTML" >&5
+$as_echo "$GTKDOC_MKHTML" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "gtkdoc-mkdb", so it can be a program name with args.
+set dummy gtkdoc-mkdb; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GTKDOC_MKDB+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GTKDOC_MKDB in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GTKDOC_MKDB="$GTKDOC_MKDB" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_GTKDOC_MKDB="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+GTKDOC_MKDB=$ac_cv_path_GTKDOC_MKDB
+if test -n "$GTKDOC_MKDB"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKDB" >&5
+$as_echo "$GTKDOC_MKDB" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "gtkdoc-scan", so it can be a program name with args.
+set dummy gtkdoc-scan; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GTKDOC_SCAN+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GTKDOC_SCAN in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GTKDOC_SCAN="$GTKDOC_SCAN" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_GTKDOC_SCAN="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+GTKDOC_SCAN=$ac_cv_path_GTKDOC_SCAN
+if test -n "$GTKDOC_SCAN"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_SCAN" >&5
+$as_echo "$GTKDOC_SCAN" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test x"$HELP2MAN" != x; then
+ HAS_HELP2MAN_TRUE=
+ HAS_HELP2MAN_FALSE='#'
+else
+ HAS_HELP2MAN_TRUE='#'
+ HAS_HELP2MAN_FALSE=
+fi
+
+ if test x"$MAN2HTML" != x; then
+ HAS_MAN2HTML_TRUE=
+ HAS_MAN2HTML_FALSE='#'
+else
+ HAS_MAN2HTML_TRUE='#'
+ HAS_MAN2HTML_FALSE=
+fi
+
+ if test x"$XSLTPROC" != x; then
+ HAS_XSLTPROC_TRUE=
+ HAS_XSLTPROC_FALSE='#'
+else
+ HAS_XSLTPROC_TRUE='#'
+ HAS_XSLTPROC_FALSE=
+fi
+
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
@@ -13255,8 +13547,8 @@ if test "z$enable_development" = "zyes" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for man pages build" >&5
@@ -13267,63 +13559,18 @@ if test "${enable_manpages_build+set}" = set; then :
fi
if test "z$enable_manpages_build" = "zyes" ; then
- # Extract the first word of "help2man", so it can be a program name with args.
-set dummy help2man; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_HELP2MAN+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $HELP2MAN in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_HELP2MAN="$HELP2MAN" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_HELP2MAN="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-HELP2MAN=$ac_cv_path_HELP2MAN
-if test -n "$HELP2MAN"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HELP2MAN" >&5
-$as_echo "$HELP2MAN" >&6; }
+ if test x"$HELP2MAN" != x; then
+ BUILD_MANPAGES_TRUE=
+ BUILD_MANPAGES_FALSE='#'
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ BUILD_MANPAGES_TRUE='#'
+ BUILD_MANPAGES_FALSE=
fi
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test x"$HELP2MAN" != x; then
- HAS_HELP2MAN_TRUE=
- HAS_HELP2MAN_FALSE='#'
-else
- HAS_HELP2MAN_TRUE='#'
- HAS_HELP2MAN_FALSE=
-fi
-
- if test x"$HELP2MAN" != x; then
+ if test "x" = "y"; then
BUILD_MANPAGES_TRUE=
BUILD_MANPAGES_FALSE='#'
else
@@ -13331,6 +13578,9 @@ else
BUILD_MANPAGES_FALSE=
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
+fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for docs build" >&5
$as_echo_n "checking for docs build... " >&6; }
@@ -13340,272 +13590,26 @@ if test "${enable_docs_build+set}" = set; then :
fi
if test "z$enable_docs_build" = "zyes" ; then
- # Extract the first word of "xsltproc", so it can be a program name with args.
-set dummy xsltproc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XSLTPROC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $XSLTPROC in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-XSLTPROC=$ac_cv_path_XSLTPROC
-if test -n "$XSLTPROC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
-$as_echo "$XSLTPROC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- # Extract the first word of "man2html", so it can be a program name with args.
-set dummy man2html; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MAN2HTML+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $MAN2HTML in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_MAN2HTML="$MAN2HTML" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_MAN2HTML="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-MAN2HTML=$ac_cv_path_MAN2HTML
-if test -n "$MAN2HTML"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAN2HTML" >&5
-$as_echo "$MAN2HTML" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- # Extract the first word of "gtkdoc-mkhtml", so it can be a program name with args.
-set dummy gtkdoc-mkhtml; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GTKDOC_MKHTML+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $GTKDOC_MKHTML in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GTKDOC_MKHTML="$GTKDOC_MKHTML" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_GTKDOC_MKHTML="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-GTKDOC_MKHTML=$ac_cv_path_GTKDOC_MKHTML
-if test -n "$GTKDOC_MKHTML"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKHTML" >&5
-$as_echo "$GTKDOC_MKHTML" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- # Extract the first word of "gtkdoc-mktmpl", so it can be a program name with args.
-set dummy gtkdoc-mktmpl; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GTKDOC_MKTMPL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $GTKDOC_MKTMPL in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GTKDOC_MKTMPL="$GTKDOC_MKTMPL" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_GTKDOC_MKTMPL="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-GTKDOC_MKTMPL=$ac_cv_path_GTKDOC_MKTMPL
-if test -n "$GTKDOC_MKTMPL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKTMPL" >&5
-$as_echo "$GTKDOC_MKTMPL" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- # Extract the first word of "gtkdoc-mkdb", so it can be a program name with args.
-set dummy gtkdoc-mkdb; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GTKDOC_MKDB+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $GTKDOC_MKDB in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GTKDOC_MKDB="$GTKDOC_MKDB" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_GTKDOC_MKDB="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-GTKDOC_MKDB=$ac_cv_path_GTKDOC_MKDB
-if test -n "$GTKDOC_MKDB"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKDB" >&5
-$as_echo "$GTKDOC_MKDB" >&6; }
+ if test x"$PERL" != x && test x"$XSLTPROC" != x && test x"$MAN2HTML" != x; then
+ BUILD_MAN_DOCS_TRUE=
+ BUILD_MAN_DOCS_FALSE='#'
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ BUILD_MAN_DOCS_TRUE='#'
+ BUILD_MAN_DOCS_FALSE=
fi
-
- # Extract the first word of "gtkdoc-scan", so it can be a program name with args.
-set dummy gtkdoc-scan; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GTKDOC_SCAN+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $GTKDOC_SCAN in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GTKDOC_SCAN="$GTKDOC_SCAN" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_GTKDOC_SCAN="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-GTKDOC_SCAN=$ac_cv_path_GTKDOC_SCAN
-if test -n "$GTKDOC_SCAN"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_SCAN" >&5
-$as_echo "$GTKDOC_SCAN" >&6; }
+ if test x"$PERL" != x && test x"$XSLTPROC" != x && test x"$GTKDOC_MKHTML" != x && test x"$GTKDOC_MKDB" != x && test x"$GTKDOC_SCAN" != x; then
+ BUILD_API_DOCS_TRUE=
+ BUILD_API_DOCS_FALSE='#'
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ BUILD_API_DOCS_TRUE='#'
+ BUILD_API_DOCS_FALSE=
fi
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test x"$MAN2HTML" != x; then
- HAS_MAN2HTML_TRUE=
- HAS_MAN2HTML_FALSE='#'
-else
- HAS_MAN2HTML_TRUE='#'
- HAS_MAN2HTML_FALSE=
-fi
-
- if test x"$XSLTPROC" != x; then
- HAS_XSLTPROC_TRUE=
- HAS_XSLTPROC_FALSE='#'
-else
- HAS_XSLTPROC_TRUE='#'
- HAS_XSLTPROC_FALSE=
-fi
-
-
- if test x"$PERL" != x && test x"$XSLTPROC" != x && test x"$MAN2HTML" != x; then
+ if test "x" = "y"; then
BUILD_MAN_DOCS_TRUE=
BUILD_MAN_DOCS_FALSE='#'
else
@@ -13613,7 +13617,7 @@ else
BUILD_MAN_DOCS_FALSE=
fi
- if test x"$PERL" != x && test x"$XSLTPROC" != x && test x"$GTKDOC_MKHTML" != x && test x"$GTKDOC_MKTMPL" != x && test x"$GTKDOC_MKDB" != x && test x"$GTKDOC_SCAN" != x; then
+ if test "x" = "y"; then
BUILD_API_DOCS_TRUE=
BUILD_API_DOCS_FALSE='#'
else
@@ -13621,10 +13625,12 @@ else
BUILD_API_DOCS_FALSE=
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
+fi
XMLSEC_EXTRA_LDFLAGS=
XMLSEC_CRYPTO_EXTRA_LDFLAGS=
-
if test -n "$shrext"; then
XMLSEC_SHLIBSFX="$shrext"
else
@@ -13644,11 +13650,11 @@ case "${host}" in
XMLSEC_CRYPTO_EXTRA_LDFLAGS="-no-undefined"
;;
*-*-darwin*)
- XMLSEC_SHLIBSFX=".dylib"
- ;;
+ XMLSEC_SHLIBSFX=".dylib"
+ ;;
esac
-if test "z$shrext" == "z" ; then
+if test "z$shrext" = "z" ; then
shrext=$shrext_cmds
fi
@@ -13870,8 +13876,51 @@ else
PKGCONFIG_FOUND="no"
fi
+ENABLE_CUSTOM_CONFIGS="no"
+# Check whether --enable-custom-configs was given.
+if test "${enable_custom_configs+set}" = set; then :
+ enableval=$enable_custom_configs;
+fi
+
+if test "z$enable_custom_configs" != "zno" ; then
+ ENABLE_CUSTOM_CONFIGS="yes"
+else
+ ENABLE_CUSTOM_CONFIGS="no"
+fi
+
+ENABLE_FOLDERS_SEARCH="no"
+# Check whether --enable-folders-search was given.
+if test "${enable_folders_search+set}" = set; then :
+ enableval=$enable_folders_search;
+fi
+
+if test "z$enable_folders_search" != "zno" ; then
+ ENABLE_FOLDERS_SEARCH="yes"
+else
+ ENABLE_FOLDERS_SEARCH="no"
+fi
+
+COMMON_INCLUDE_DIR="/usr/include /usr/local/include"
+COMMON_LIB_DIR="/usr/lib /usr/lib64 /usr/local/lib"
+case $host in
+ i*86-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/i386-linux-gnu" ;;
+ x86_64-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/x86_64-linux-gnu" ;;
+ *) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/$host" ;;
+esac
+
+
+
LIBXML_MIN_VERSION="2.8.0"
+LIBXML_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/include/libxml2 /usr/local/include/libxml2 /usr/local/libxml2/include"
+LIBXML_LIB_DIR="$COMMON_LIB_DIR /usr/local/libxml2/lib"
+LIBXML_INCLUDE_MARKER="libxml/xmlversion.h"
+LIBXML_LIB_MARKER="libxml2$shrext"
+LIBXML_LIBS_LIST="-lxml2"
LIBXML_CONFIG="xml2-config"
+
+LIBXML_INCLUDE_PATH=
+LIBXML_LIB_PATH=
+LIBXML_CONFIG_PATH=
LIBXML_FOUND="no"
# Check whether --with-libxml was given.
@@ -13886,28 +13935,48 @@ if test "${with_libxml_src+set}" = set; then :
fi
-if test "z$LIBXML_CFLAGS" = "z" -o "z$LIBXML_LIBS" = "z"; then
- if test "z$with_libxml" = "zno" -o "z$with_libxml_src" = "zno"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2 libraries >= $LIBXML_MIN_VERSION" >&5
-$as_echo_n "checking for libxml2 libraries >= $LIBXML_MIN_VERSION... " >&6; }
- as_fn_error $? "libxml2 >= $LIBXML_MIN_VERSION is required for $XMLSEC_PACKAGE" "$LINENO" 5
- elif test "z$with_libxml_src" != "z" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2 libraries >= $LIBXML_MIN_VERSION" >&5
-$as_echo_n "checking for libxml2 libraries >= $LIBXML_MIN_VERSION... " >&6; }
- CWD=`pwd`
- if cd "$with_libxml_src" ; then
- SRC_DIR=`pwd`
- LIBXML_CONFIG=${SRC_DIR}/xml2-config
- LIBXML_LIBS="-L${SRC_DIR}/.libs -lxml2"
- LIBXML_CFLAGS="-I${SRC_DIR}/include"
- LIBXML_FOUND="yes"
- cd $CWD
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (source)" >&5
-$as_echo "yes (source)" >&6; }
- else
- as_fn_error $? "libxml source dir not found (${with_libxml_src}), typo?" "$LINENO" 5
- fi
- elif test "z$with_libxml" = "z" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
+if test "z$with_libxml" = "zno" -o "z$with_libxml_src" = "zno"; then
+ LIBXML_FOUND="disabled"
+fi
+
+if test "z$LIBXML_FOUND" = "zno" -a "z$with_libxml_src" != "z" -a "z$with_libxml_src" != "zyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2 library source tree in \"$with_libxml_src\" folder" >&5
+$as_echo_n "checking for libxml2 library source tree in \"$with_libxml_src\" folder... " >&6; }
+ if test -f "$with_libxml_src/include/$LIBXML_INCLUDE_MARKER" -a -f "$with_libxml_src/.libs/$LIBXML_LIB_MARKER" ; then
+ LIBXML_INCLUDE_PATH="$with_libxml_src/include"
+ LIBXML_LIB_PATH="$with_libxml_src/.libs"
+ LIBXML_FOUND="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ as_fn_error $? "not found: \"$with_libxml_src/include/$LIBXML_INCLUDE_MARKER\" or \"$with_libxml_src/.libs/$LIBXML_LIB_MARKER\" files don't exist), typo?" "$LINENO" 5
+ fi
+fi
+
+if test "z$LIBXML_FOUND" = "zno" -a "z$with_libxml" != "z" -a "z$with_libxml" != "zyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2 library installation in \"$with_libxml\" folder" >&5
+$as_echo_n "checking for libxml2 library installation in \"$with_libxml\" folder... " >&6; }
+ if test "z$ENABLE_CUSTOM_CONFIGS" = "zyes" -a -f "$with_libxml/bin/$LIBXML_CONFIG" ; then
+ LIBXML_CONFIG_PATH="$with_libxml/bin/$LIBXML_CONFIG"
+ LIBXML_FOUND="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ elif test -f "$with_libxml/include/libxml2/$LIBXML_INCLUDE_MARKER" -a -f "$with_libxml/lib/$LIBXML_LIB_MARKER" ; then
+ LIBXML_INCLUDE_PATH="$with_libxml/include/libxml2"
+ LIBXSLT_LIB_PATH="$with_libxml/lib"
+ LIBXML_FOUND="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ as_fn_error $? "not found: \"$with_libxml/bin/$LIBXML_CONFIG\" tool, or \"$with_libxml/include/libxml2/$LIBXML_INCLUDE_MARKER\" and/or \"$with_libxml/lib/$LIBXML_LIB_MARKER\" files don't exist), typo?" "$LINENO" 5
+ fi
+fi
+
+if test "z$LIBXML_FOUND" = "zno" -a "z$LIBXML_CFLAGS" != "z" -a "z$LIBXML_LIBS" != "z" ; then
+ LIBXML_FOUND="yes"
+fi
+
+if test "z$LIBXML_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML" >&5
@@ -13979,31 +14048,29 @@ else
$as_echo "yes" >&6; }
LIBXML_FOUND=yes
fi
- fi
- if test "z$LIBXML_FOUND" = "zno" ; then
- if test "z$with_libxml" != "zyes" ; then
- if test "z$with_libxml" != "z" ; then
- # Extract the first word of "$LIBXML_CONFIG", so it can be a program name with args.
+fi
+
+if test "z$LIBXML_FOUND" = "zno" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then
+ # Extract the first word of "$LIBXML_CONFIG", so it can be a program name with args.
set dummy $LIBXML_CONFIG; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LIBXML_CONFIG+:} false; then :
+if ${ac_cv_path_LIBXML_CONFIG_PATH+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $LIBXML_CONFIG in
+ case $LIBXML_CONFIG_PATH in
[\\/]* | ?:[\\/]*)
- ac_cv_path_LIBXML_CONFIG="$LIBXML_CONFIG" # Let the user override the test with a path.
+ ac_cv_path_LIBXML_CONFIG_PATH="$LIBXML_CONFIG_PATH" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$with_libxml/bin:$PATH"
-for as_dir in $as_dummy
+for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_LIBXML_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_LIBXML_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -14014,97 +14081,155 @@ IFS=$as_save_IFS
;;
esac
fi
-LIBXML_CONFIG=$ac_cv_path_LIBXML_CONFIG
-if test -n "$LIBXML_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_CONFIG" >&5
-$as_echo "$LIBXML_CONFIG" >&6; }
+LIBXML_CONFIG_PATH=$ac_cv_path_LIBXML_CONFIG_PATH
+if test -n "$LIBXML_CONFIG_PATH"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_CONFIG_PATH" >&5
+$as_echo "$LIBXML_CONFIG_PATH" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- else
- # Extract the first word of "$LIBXML_CONFIG", so it can be a program name with args.
-set dummy $LIBXML_CONFIG; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LIBXML_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $LIBXML_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_LIBXML_CONFIG="$LIBXML_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_LIBXML_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
+ if test "z$LIBXML_CONFIG_PATH" != "z" ; then
+ LIBXML_FOUND="yes"
+ fi
+fi
- ;;
-esac
+if test "z$LIBXML_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2 library installation in the typical folders" >&5
+$as_echo_n "checking for libxml2 library installation in the typical folders... " >&6; }
+ if test "z$LIBXML_INCLUDE_PATH" = "z" ; then
+
+ for dir in $LIBXML_INCLUDE_DIR ; do
+ if test -f "$dir/$LIBXML_INCLUDE_MARKER" ; then
+ LIBXML_INCLUDE_PATH="$dir"
+ break;
+ fi
+ done
+
+ fi
+ if test "z$LIBXML_LIB_PATH" = "z" ; then
+
+ for dir in $LIBXML_LIB_DIR ; do
+ if test -f "$dir/$LIBXML_LIB_MARKER" ; then
+ LIBXML_LIB_PATH="$dir"
+ break;
+ fi
+ done
+
+ fi
+ if test "z$LIBXML_INCLUDE_PATH" != "z" -a "z$LIBXML_LIB_PATH" != "z" ; then
+ LIBXML_FOUND="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (\"-I$LIBXML_INCLUDE_PATH -L$LIBXML_LIB_PATH\")" >&5
+$as_echo "yes (\"-I$LIBXML_INCLUDE_PATH -L$LIBXML_LIB_PATH\")" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+ fi
fi
-LIBXML_CONFIG=$ac_cv_path_LIBXML_CONFIG
-if test -n "$LIBXML_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_CONFIG" >&5
-$as_echo "$LIBXML_CONFIG" >&6; }
+
+if test "z$LIBXML_FOUND" = "zno" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2 library installation" >&5
+$as_echo_n "checking for libxml2 library installation... " >&6; }
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $LIBXML_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $LIBXML_LIBS $LIBXML_LIBS_LIST"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+
+ #include <libxml/xmlversion.h>
+
+int
+main ()
+{
+
+ int main () { xmlCheckVersion(0);; return(0); }
+
+ ;
+ return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+ LIBXML_FOUND=yes
+ LIBXML_LIBS="$LIBXML_LIBS $LIBXML_LIBS_LIST"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+ LIBXML_FOUND=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
- fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
+fi
+
+if test "z$LIBXML_FOUND" = "zyes" ; then
+ if test "z$LIBXML_CONFIG_PATH" != "z" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then
+ if test "z$LIBXML_CFLAGS" = "z" ; then
+ LIBXML_CFLAGS="`$LIBXML_CONFIG_PATH --cflags`"
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 $LIBXML_CONFIG " >&5
-$as_echo_n "checking libxml2 $LIBXML_CONFIG ... " >&6; }
- if ! LIBXML_VERSION=`$LIBXML_CONFIG --version 2>/dev/null`; then
- as_fn_error $? "Could not find libxml2 anywhere." "$LINENO" 5
+ if test "z$LIBXML_LIBS" = "z"; then
+ LIBXML_LIBS="`$LIBXML_CONFIG_PATH --libs`"
fi
- vers=`echo $LIBXML_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- minvers=`echo $LIBXML_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- if test "$vers" -ge "$minvers" ; then
- LIBXML_LIBS="`$LIBXML_CONFIG --libs`"
- LIBXML_CFLAGS="`$LIBXML_CONFIG --cflags`"
- LIBXML_FOUND="yes"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ('$LIBXML_VERSION')" >&5
-$as_echo "yes ('$LIBXML_VERSION')" >&6; }
- else
- as_fn_error $? "You need at least libxml2 $LIBXML_MIN_VERSION for this version of $XMLSEC_PACKAGE" "$LINENO" 5
+ LIBXML_CONFIG=$LIBXML_CONFIG_PATH
+ LIBXML_FOUND="yes"
+ else
+ if test "z$LIBXML_INCLUDE_PATH" != "z" ; then
+ LIBXML_CFLAGS="$LIBXML_CFLAGS -I$LIBXML_INCLUDE_PATH"
+ fi
+ if test "z$LIBXML_LIB_PATH" != "z" ; then
+ if test "z$with_gnu_ld" = "zyes" ; then
+ LIBXML_LIBS="$LIBXML_LIBS -Wl,-rpath-link -Wl,$LIBXML_LIB_PATH"
+ fi
+ LIBXML_LIBS="$LIBXML_LIBS -L$LIBXML_LIB_PATH $LIBXML_LIBS_LIST"
fi
fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2 libraries >= $LIBXML_MIN_VERSION" >&5
-$as_echo_n "checking for libxml2 libraries >= $LIBXML_MIN_VERSION... " >&6; }
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2 library >= $LIBXML_MIN_VERSION" >&5
+$as_echo_n "checking for libxml2 library >= $LIBXML_MIN_VERSION... " >&6; }
+if test "z$LIBXML_FOUND" = "zyes" ; then
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $LIBXML_CFLAGS"
minvers=`echo $LIBXML_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 100 + $2) * 100 + $3;}'`
- __save_CFLAGS="${CFLAGS}"
- CFLAGS="${CFLAGS} ${LIBXML_CFLAGS}"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <libxml/xmlversion.h>
-#if LIBXML_VERSION < $minvers
-#error "libxml2 is too old"
-#endif
+
+ #include <libxml/xmlversion.h>
+ #if LIBXML_VERSION >= $minvers
+ greater-than-minvers
+ #endif
+
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "greater-than-minvers" >/dev/null 2>&1; then :
+
+ LIBXML_FOUND=yes
+
else
- as_fn_error $? "You need at least libxml2 $LIBXML_MIN_VERSION for this version of $XMLSEC_PACKAGE" "$LINENO" 5
+
+ LIBXML_FOUND=no
+
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS="${__save_CFLAGS}"
+rm -f conftest*
+
+ CPPFLAGS=$OLD_CPPFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_FOUND" >&5
+$as_echo "$LIBXML_FOUND" >&6; }
+
+if test "z$LIBXML_FOUND" != "zyes" ; then
+ as_fn_error $? "libxml2 library >= $LIBXML_MIN_VERSION is required for this version of $XMLSEC_PACKAGE" "$LINENO" 5
fi
@@ -14112,12 +14237,18 @@ fi
-XMLSEC_NO_LIBXSLT="1"
LIBXSLT_MIN_VERSION=1.0.20
-LIBXSLT_PC_FILE_COND="libxslt >= $LIBXSLT_MIN_VERSION"
+LIBXSLT_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/local/libxslt/include"
+LIBXSLT_LIB_DIR="$COMMON_LIB_DIR /usr/local/libxslt/lib"
LIBXSLT_CONFIG="xslt-config"
-LIBXSLT_CFLAGS=""
-LIBXSLT_LIBS=""
+LIBXSLT_INCLUDE_MARKER="libxslt/xsltconfig.h"
+LIBXSLT_LIB_MARKER="libxslt$shrext"
+LIBXSLT_LIBS_LIST="-lxslt"
+
+XMLSEC_NO_LIBXSLT="1"
+LIBXSLT_INCLUDE_PATH=
+LIBXSLT_LIB_PATH=
+LIBXSLT_CONFIG_PATH=
LIBXSLT_FOUND="no"
# Check whether --with-libxslt was given.
@@ -14131,29 +14262,49 @@ if test "${with_libxslt_src+set}" = set; then :
withval=$with_libxslt_src;
fi
+
if test "z$with_libxslt" = "zno" -o "z$with_libxslt_src" = "zno" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxslt libraries >= $LIBXSLT_MIN_VERSION" >&5
-$as_echo_n "checking for libxslt libraries >= $LIBXSLT_MIN_VERSION... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- LIBXSLT_FOUND="without"
-elif test "z$with_libxslt_src" != "z" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxslt libraries >= $LIBXSLT_MIN_VERSION" >&5
-$as_echo_n "checking for libxslt libraries >= $LIBXSLT_MIN_VERSION... " >&6; }
- CWD=`pwd`
- if cd "$with_libxslt_src" ; then
- SRC_DIR=`pwd`
- LIBXSLT_CONFIG=${SRC_DIR}/xslt-config
- LIBXSLT_LIBS="-L${SRC_DIR}/libxslt/.libs -lxslt"
- LIBXSLT_CFLAGS="-I${SRC_DIR}"
- LIBXSLT_FOUND="yes"
- cd $CWD
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (source)" >&5
-$as_echo "yes (source)" >&6; }
+ LIBXSLT_FOUND="disabled"
+fi
+
+if test "z$LIBXSLT_FOUND" = "zno" -a "z$with_libxslt_src" != "z" -a "z$with_libxslt_src" != "zyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxslt library source tree in \"$with_libxslt_src\" folder" >&5
+$as_echo_n "checking for libxslt library source tree in \"$with_libxslt_src\" folder... " >&6; }
+ if test -f "$with_libxslt_src/$LIBXSLT_INCLUDE_MARKER" -a -f "$with_libxslt_src/libxslt/.libs/$LIBXSLT_LIB_MARKER" ; then
+ LIBXSLT_INCLUDE_PATH="$with_libxslt_src"
+ LIBXSLT_LIB_PATH="$with_libxslt_src/libxslt/.libs"
+ LIBXSLT_FOUND="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ as_fn_error $? "not found: \"$with_libxslt_src/$LIBXSLT_INCLUDE_MARKER\" and/or \"$with_libxslt_src/libxslt/.libs/$LIBXSLT_LIB_MARKER\" files don't exist), typo?" "$LINENO" 5
+ fi
+fi
+
+if test "z$LIBXSLT_FOUND" = "zno" -a "z$with_libxslt" != "z" -a "z$with_libxslt" != "zyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxslt library installation in \"$with_libxslt\" folder" >&5
+$as_echo_n "checking for libxslt library installation in \"$with_libxslt\" folder... " >&6; }
+ if test "z$ENABLE_CUSTOM_CONFIGS" = "zyes" -a -f "$with_libxslt/bin/$LIBXSLT_CONFIG" ; then
+ LIBXSLT_CONFIG_PATH="$with_libxslt/bin/$LIBXSLT_CONFIG"
+ LIBXSLT_FOUND="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ elif test -f "$with_libxslt/include/$LIBXSLT_INCLUDE_MARKER" -a -f "$with_libxslt/lib/$LIBXSLT_LIB_MARKER" ; then
+ LIBXSLT_INCLUDE_PATH="$with_libxslt/include"
+ LIBXSLT_LIB_PATH="$with_libxslt/lib"
+ LIBXSLT_FOUND="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- as_fn_error $? "libxslt source dir not found (${with_libxslt_src}), typo?" "$LINENO" 5
+ as_fn_error $? "not found: \"$with_libxslt/bin/$LIBXSLT_CONFIG\" tool, or \"$with_libxslt/include/$LIBXSLT_INCLUDE_MARKER\" and/or \"$with_libxslt/lib/$LIBXSLT_LIB_MARKER\" files don't exist), typo?" "$LINENO" 5
fi
-elif test "z$with_libxslt" = "z" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
+fi
+
+if test "z$LIBXSLT_FOUND" = "zno" -a "z$LIBXSLT_CFLAGS" != "z" -a "z$LIBXSLT_LIBS" != "z" ; then
+ LIBXSLT_FOUND="yes"
+fi
+
+if test "z$LIBXSLT_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXSLT" >&5
@@ -14227,30 +14378,27 @@ $as_echo "yes" >&6; }
fi
fi
-if test "z$LIBXSLT_FOUND" = "zno" ; then
- if test "z$with_libxslt" != "zyes" ; then
- if test "z$with_libxslt" != "z" ; then
- # Extract the first word of "$LIBXSLT_CONFIG", so it can be a program name with args.
+if test "z$LIBXSLT_FOUND" = "zno" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then
+ # Extract the first word of "$LIBXSLT_CONFIG", so it can be a program name with args.
set dummy $LIBXSLT_CONFIG; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LIBXSLT_CONFIG+:} false; then :
+if ${ac_cv_path_LIBXSLT_CONFIG_PATH+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $LIBXSLT_CONFIG in
+ case $LIBXSLT_CONFIG_PATH in
[\\/]* | ?:[\\/]*)
- ac_cv_path_LIBXSLT_CONFIG="$LIBXSLT_CONFIG" # Let the user override the test with a path.
+ ac_cv_path_LIBXSLT_CONFIG_PATH="$LIBXSLT_CONFIG_PATH" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$with_libxslt/bin:$PATH"
-for as_dir in $as_dummy
+for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_LIBXSLT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_LIBXSLT_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -14261,289 +14409,229 @@ IFS=$as_save_IFS
;;
esac
fi
-LIBXSLT_CONFIG=$ac_cv_path_LIBXSLT_CONFIG
-if test -n "$LIBXSLT_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_CONFIG" >&5
-$as_echo "$LIBXSLT_CONFIG" >&6; }
+LIBXSLT_CONFIG_PATH=$ac_cv_path_LIBXSLT_CONFIG_PATH
+if test -n "$LIBXSLT_CONFIG_PATH"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_CONFIG_PATH" >&5
+$as_echo "$LIBXSLT_CONFIG_PATH" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- else
- # Extract the first word of "$LIBXSLT_CONFIG", so it can be a program name with args.
-set dummy $LIBXSLT_CONFIG; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LIBXSLT_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $LIBXSLT_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_LIBXSLT_CONFIG="$LIBXSLT_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_LIBXSLT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-LIBXSLT_CONFIG=$ac_cv_path_LIBXSLT_CONFIG
-if test -n "$LIBXSLT_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_CONFIG" >&5
-$as_echo "$LIBXSLT_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ if test "z$LIBXSLT_CONFIG_PATH" != "z" ; then
+ LIBXSLT_FOUND="yes"
+ fi
fi
+if test "z$LIBXSLT_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxslt library installation in the typical folders" >&5
+$as_echo_n "checking for libxslt library installation in the typical folders... " >&6; }
+ if test "z$LIBXSLT_INCLUDE_PATH" = "z" ; then
+ for dir in $LIBXSLT_INCLUDE_DIR ; do
+ if test -f "$dir/$LIBXSLT_INCLUDE_MARKER" ; then
+ LIBXSLT_INCLUDE_PATH="$dir"
+ break;
fi
+ done
+
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxslt libraries >= $LIBXSLT_MIN_VERSION" >&5
-$as_echo_n "checking for libxslt libraries >= $LIBXSLT_MIN_VERSION... " >&6; }
- if ! LIBXSLT_VERSION=`$LIBXSLT_CONFIG --version 2>/dev/null`; then
- if test "z$with_libxslt" != "zyes" ; then
- as_fn_error $? "Unable to find libxslt at '$with_libxslt'" "$LINENO" 5
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- fi
+ if test "z$LIBXSLT_LIB_PATH" = "z" ; then
+
+ for dir in $LIBXSLT_LIB_DIR ; do
+ if test -f "$dir/$LIBXSLT_LIB_MARKER" ; then
+ LIBXSLT_LIB_PATH="$dir"
+ break;
+ fi
+ done
+
+ fi
+ if test "z$LIBXSLT_INCLUDE_PATH" != "z" -a "z$LIBXSLT_LIB_PATH" != "z" ; then
+ LIBXSLT_FOUND="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (\"-I$LIBXSLT_INCLUDE_PATH -L$LIBXSLT_LIB_PATH\")" >&5
+$as_echo "yes (\"-I$LIBXSLT_INCLUDE_PATH -L$LIBXSLT_LIB_PATH\")" >&6; }
else
- vers=`echo $LIBXSLT_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- minvers=`echo $LIBXSLT_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- if test "$vers" -ge "$minvers" ; then
- LIBXSLT_LIBS="`$LIBXSLT_CONFIG --libs`"
- LIBXSLT_CFLAGS="`$LIBXSLT_CONFIG --cflags`"
- LIBXSLT_FOUND="yes"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ('$LIBXSLT_VERSION')" >&5
-$as_echo "yes ('$LIBXSLT_VERSION')" >&6; }
- else
- as_fn_error $? "You need at least libxslt $LIBXSLT_MIN_VERSION for this version of $XMLSEC_PACKAGE" "$LINENO" 5
- fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
fi
fi
-if test "z$LIBXSLT_FOUND" = "zyes" ; then
- XMLSEC_NO_LIBXSLT="0"
-else
- LIBXSLT_PC_FILE_COND=""
- LIBXSLT_MIN_VERSION=""
- XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XSLT=1"
-fi
-
+if test "z$LIBXSLT_FOUND" = "zno" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxslt library installation" >&5
+$as_echo_n "checking for libxslt library installation... " >&6; }
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $LIBXML_CFLAGS $LIBXSLT_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $LIBXML_LIBS $LIBXSLT_LIBS $LIBXSLT_LIBS_LIST"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+ #include <libxslt/xslt.h>
+int
+main ()
+{
+ int main () { xsltInit(); return(0); }
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
-XMLSEC_CRYPTO_LIST=""
-XMLSEC_CRYPTO_DISABLED_LIST=""
+ LIBXSLT_FOUND=yes
+ LIBXSLT_LIBS="$LIBXSLT_LIBS $LIBXSLT_LIBS_LIST"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
-ac_openssl_lib_dir="/usr/local/lib /usr/lib /usr/lib64 /usr/local /usr/local/ssl /usr/local/ssl/lib /usr/pkg"
-ac_openssl_inc_dir="/usr/local/include /usr/include /usr/local /usr/local/ssl /usr/pkg /usr/local/ssl/include"
+else
-XMLSEC_NO_OPENSSL="1"
-OPENSSL_MIN_VERSION="1.0.0"
-OPENSSL_VERSION=""
-OPENSSL_CFLAGS=""
-OPENSSL_LIBS=""
-OPENSSL_CRYPTO_LIB="$XMLSEC_PACKAGE-openssl"
-OPENSSL_FOUND=no
+ LIBXSLT_FOUND=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
-# Check whether --with-openssl was given.
-if test "${with_openssl+set}" = set; then :
- withval=$with_openssl;
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
fi
-if test "z$with_openssl" = "zno" ; then
- OPENSSL_FOUND=without
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl libraries >= $OPENSSL_MIN_VERSION" >&5
-$as_echo_n "checking for openssl libraries >= $OPENSSL_MIN_VERSION... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-elif test "z$with_openssl" != "z" ; then
- case $host in
- *-*-mingw*) openssl_exlibs=;;
- *-*-osf5*) openssl_exlibs=;;
- *-*-openbsd*) openssl_exlibs=;;
- *-*-netbsd*) openssl_exlibs=;;
- #FIXME: check if lib "dl" is required
- *) openssl_exlibs=-ldl;;
- esac
- OPENSSL_CFLAGS="$OPENSSL_CFLAGS -I$with_openssl/include"
- if test -f "$with_openssl/lib/libcrypto${XMLSEC_SHLIBSFX}" ; then
- OPENSSL_LIBS="-L$with_openssl/lib -lcrypto $openssl_exlibs"
+if test "z$LIBXSLT_FOUND" = "zyes" ; then
+ if test "z$LIBXSLT_CONFIG_PATH" != "z" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then
+ if test "z$LIBXSLT_CFLAGS" = "z" ; then
+ LIBXSLT_CFLAGS="`$LIBXSLT_CONFIG_PATH --cflags`"
+ fi
+ if test "z$LIBXSLT_LIBS" = "z"; then
+ LIBXSLT_LIBS="`$LIBXSLT_CONFIG_PATH --libs`"
+ fi
+ LIBXSLT_CONFIG=$LIBXSLT_CONFIG_PATH
+ LIBXSLT_FOUND="yes"
else
- OPENSSL_LIBS="$with_openssl/lib/libcrypto.a $openssl_exlibs"
+ if test "z$LIBXSLT_INCLUDE_PATH" != "z" ; then
+ LIBXSLT_CFLAGS="$LIBXSLT_CFLAGS -I$LIBXSLT_INCLUDE_PATH"
+ fi
+ if test "z$LIBXSLT_LIB_PATH" != "z" ; then
+ if test "z$with_gnu_ld" = "zyes" ; then
+ LIBXSLT_LIBS="$LIBXSLT_LIBS -Wl,-rpath-link -Wl,$LIBXSLT_LIB_PATH"
+ fi
+ LIBXSLT_LIBS="$LIBXSLT_LIBS -L$LIBXSLT_LIB_PATH $LIBXSLT_LIBS_LIST"
+ fi
fi
- OPENSSL_FOUND="yes"
-elif test "z$PKGCONFIG_FOUND" = "zyes" ; then
- if test "z$OPENSSL_VERSION" = "z" ; then
+fi
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
-$as_echo_n "checking for OPENSSL... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxslt library >= $LIBXSLT_MIN_VERSION" >&5
+$as_echo_n "checking for libxslt library >= $LIBXSLT_MIN_VERSION... " >&6; }
+if test "z$LIBXSLT_FOUND" = "zyes" ; then
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $LIBXSLT_CFLAGS"
+ minvers=`echo $LIBXSLT_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 100 + $2) * 100 + $3;}'`
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <libxslt/xsltconfig.h>
+ #if LIBXSLT_VERSION >= $minvers
+ greater-than-minvers
+ #endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "greater-than-minvers" >/dev/null 2>&1; then :
+
+ LIBXSLT_FOUND=yes
-if test -n "$OPENSSL_CFLAGS"; then
- pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "openssl >= 1.1.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.1.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
- pkg_failed=yes
+
+ LIBXSLT_FOUND=no
+
fi
- else
- pkg_failed=untried
+rm -f conftest*
+
+ CPPFLAGS=$OLD_CPPFLAGS
fi
-if test -n "$OPENSSL_LIBS"; then
- pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "openssl >= 1.1.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.1.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_FOUND" >&5
+$as_echo "$LIBXSLT_FOUND" >&6; }
+
+if test "z$LIBXSLT_FOUND" = "zyes" ; then
+ XMLSEC_NO_LIBXSLT="0"
+ LIBXSLT_PC_FILE_COND="libxslt >= $LIBXSLT_MIN_VERSION"
else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
+ XMLSEC_NO_LIBXSLT="1"
+ LIBXSLT_PC_FILE_COND=""
+ XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XSLT=1"
fi
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl >= 1.1.0" 2>&1`
- else
- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl >= 1.1.0" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$OPENSSL_PKG_ERRORS" >&5
- OPENSSL_VERSION=""
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- OPENSSL_VERSION=""
-else
- OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
- OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- OPENSSL_VERSION="1.1.0"
-fi
- fi
- if test "z$OPENSSL_VERSION" = "z" ; then
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
-$as_echo_n "checking for OPENSSL... " >&6; }
+XMLSEC_CRYPTO_LIST=""
+XMLSEC_CRYPTO_DISABLED_LIST=""
-if test -n "$OPENSSL_CFLAGS"; then
- pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.0.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$OPENSSL_LIBS"; then
- pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.0.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
+OPENSSL_MIN_VERSION="1.0.0"
+OPENSSL_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/local/ssl/include"
+OPENSSL_LIB_DIR="$COMMON_LIB_DIR /usr/local/ssl/lib"
+OPENSSL_CRYPTO_LIB="$XMLSEC_PACKAGE-openssl"
+OPENSSL_INCLUDE_MARKER="openssl/opensslv.h"
+OPENSSL_LIB_SHARED_MARKER="libcrypto$shrext"
+OPENSSL_LIB_STATIC_MARKER="libcrypto.a"
+OPENSSL_LIBS_LIST="-lcrypto"
+case $host in
+ *-*-mingw*) OPENSSL_EXTRA_LIBS=;;
+ *-*-osf5*) OPENSSL_EXTRA_LIBS=;;
+ *-*-openbsd*) OPENSSL_EXTRA_LIBS=;;
+ *-*-netbsd*) OPENSSL_EXTRA_LIBS=;;
+ #FIXME: check if lib "dl" is required
+ *) OPENSSL_EXTRA_LIBS=-ldl;;
+esac
+XMLSEC_NO_OPENSSL="1"
+OPENSSL_VERSION=""
+OPENSSL_INCLUDE_PATH=
+OPENSSL_LIB_PATH=
+OPENSSL_FOUND=no
+# Check whether --with-openssl was given.
+if test "${with_openssl+set}" = set; then :
+ withval=$with_openssl;
+fi
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
+if test "z$with_openssl" = "zno" ; then
+ OPENSSL_FOUND=disabled
fi
- if test $_pkg_short_errors_supported = yes; then
- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl >= 1.0.0" 2>&1`
- else
- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl >= 1.0.0" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$OPENSSL_PKG_ERRORS" >&5
- OPENSSL_VERSION=""
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- OPENSSL_VERSION=""
-else
- OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
- OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
+if test "z$OPENSSL_FOUND" = "zno" -a "z$with_openssl" != "z" -a "z$with_openssl" != "zyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl library installation in \"$with_openssl\" folder" >&5
+$as_echo_n "checking for openssl library installation in \"$with_openssl\" folder... " >&6; }
+ if test -f "$with_openssl/include/$OPENSSL_INCLUDE_MARKER" -a -f "$with_openssl/lib/$OPENSSL_LIB_SHARED_MARKER" ; then
+ OPENSSL_INCLUDE_PATH="$with_openssl/include"
+ OPENSSL_LIB_PATH="$with_openssl/lib"
+ OPENSSL_FOUND="yes"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- OPENSSL_VERSION="1.0.0"
-fi
+ elif test -f "$with_openssl/include/$OPENSSL_INCLUDE_MARKER" -a -f "$with_openssl/lib/$OPENSSL_LIB_STATIC_MARKER" ; then
+ OPENSSL_INCLUDE_PATH="$with_openssl/include"
+ OPENSSL_LIB_PATH="$with_openssl/lib"
+ OPENSSL_FOUND="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ as_fn_error $? "not found: \"$with_openssl/include/$OPENSSL_INCLUDE_MARKER\" or \"$with_openssl/lib/$OPENSSL_LIB_SHARED_MARKER\" or \"$with_openssl/lib/$OPENSSL_LIB_STATIC_MARKER\" files don't exist), typo?" "$LINENO" 5
fi
+fi
- if test "z$OPENSSL_VERSION" = "z" ; then
+if test "z$OPENSSL_FOUND" = "zno" -a "z$OPENSSL_CFLAGS" != "z" -a "z$OPENSSL_LIBS" != "z" ; then
+ OPENSSL_FOUND="yes"
+fi
+
+if test "z$OPENSSL_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
@@ -14603,84 +14691,176 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$OPENSSL_PKG_ERRORS" >&5
- OPENSSL_VERSION=""
+ OPENSSL_FOUND=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- OPENSSL_VERSION=""
+ OPENSSL_FOUND=no
else
OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- OPENSSL_VERSION="$OPENSSL_MIN_VERSION"
+ OPENSSL_FOUND=yes
fi
+fi
+
+if test "z$OPENSSL_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl library installation in the typical folders" >&5
+$as_echo_n "checking for openssl library installation in the typical folders... " >&6; }
+ if test "z$OPENSSL_INCLUDE_PATH" = "z" ; then
+
+ for dir in $OPENSSL_INCLUDE_DIR ; do
+ if test -f "$dir/$OPENSSL_INCLUDE_MARKER" ; then
+ OPENSSL_INCLUDE_PATH="$dir"
+ break;
+ fi
+ done
+
fi
+ if test "z$OPENSSL_LIB_PATH" = "z" ; then
- if test "z$OPENSSL_VERSION" != "z" ; then
+ for dir in $OPENSSL_LIB_DIR ; do
+ if test -f "$dir/$OPENSSL_LIB_SHARED_MARKER" ; then
+ OPENSSL_LIB_PATH="$dir"
+ break;
+ fi
+ done
+
+ fi
+ if test "z$OPENSSL_LIB_PATH" = "z" ; then
+
+ for dir in $OPENSSL_LIB_DIR ; do
+ if test -f "$dir/$OPENSSL_LIB_STATIC_MARKER" ; then
+ OPENSSL_LIB_PATH="$dir"
+ break;
+ fi
+ done
+
+ fi
+ if test "z$OPENSSL_INCLUDE_PATH" != "z" -a "z$OPENSSL_LIB_PATH" != "z" ; then
OPENSSL_FOUND="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (\"-I$OPENSSL_INCLUDE_PATH -L$OPENSSL_LIB_PATH\")" >&5
+$as_echo "yes (\"-I$OPENSSL_INCLUDE_PATH -L$OPENSSL_LIB_PATH\")" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
fi
fi
if test "z$OPENSSL_FOUND" = "zno" ; then
- OPENSSL_INCLUDES_FOUND="no"
- OPENSSL_LIBS_FOUND="no"
-
- for dir in $ac_openssl_inc_dir ; do
- if test -f $dir/openssl/ssl.h ; then
- if test "z$dir" = "z/usr/include" ; then
- OPENSSL_CFLAGS="$OPENSSL_CFLAGS "
- else
- OPENSSL_CFLAGS="$OPENSSL_CFLAGS -I$dir"
- fi
- OPENSSL_INCLUDES_FOUND="yes"
- break
- fi
- done
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl library installation" >&5
+$as_echo_n "checking for openssl library installation... " >&6; }
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $OPENSSL_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $OPENSSL_LIBS $OPENSSL_LIBS_LIST"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
- for dir in $ac_openssl_lib_dir ; do
- if test -f $dir/libcrypto.a ; then
- if test "z$dir" = "z/usr/lib" ; then
- OPENSSL_LIBS="-lcrypto -ldl"
- else
- OPENSSL_LIBS="-L$dir -lcrypto -ldl"
- fi
- OPENSSL_LIBS_FOUND="yes"
- ac_found_openssl_lib_dir=$dir
- break;
- fi
- done
- if test "z$OPENSSL_INCLUDES_FOUND" = "zyes" -a "z$OPENSSL_LIBS_FOUND" = "zyes" ; then
- OPENSSL_FOUND="yes"
+ #include <openssl/opensslv.h>
+
+int
+main ()
+{
+
+ int main () {
+ #if OPENSSL_VERSION_NUMBER < 0x10100000L
+ SSL_library_init();
+ #else
+ OPENSSL_init_ssl(0, NULL);
+ #endif
+ return(0);
+ }
+
+ ;
+ return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+ OPENSSL_FOUND=yes
+ OPENSSL_LIBS="$OPENSSL_LIBS $OPENSSL_LIBS_LIST"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+ OPENSSL_FOUND=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
+fi
+
+if test "z$OPENSSL_FOUND" = "zyes" -a "z$OPENSSL_INCLUDE_PATH" != "z" ; then
+ OPENSSL_CFLAGS="$OPENSSL_CFLAGS -I$OPENSSL_INCLUDE_PATH -I$OPENSSL_INCLUDE_PATH/openssl"
+fi
+if test "z$OPENSSL_FOUND" = "zyes" -a "z$OPENSSL_LIB_PATH" != "z" ; then
+ if test -f "$OPENSSL_LIB_PATH/$OPENSSL_LIB_SHARED_MARKER" ; then
+ if test "z$with_gnu_ld" = "zyes" ; then
+ OPENSSL_LIBS="$OPENSSL_LIBS -Wl,-rpath-link -Wl,$OPENSSL_LIB_PATH"
+ fi
+ OPENSSL_LIBS="$OPENSSL_LIBS -L$OPENSSL_LIB_PATH $OPENSSL_LIBS_LIST"
+ elif test -f $OPENSSL_LIB_PATH/$OPENSSL_LIB_STATIC_MARKER ; then
+ OPENSSL_LIBS="$OPENSSL_LIBS $OPENSSL_LIB_PATH/libcrypto.a"
fi
+ OPENSSL_LIBS="$OPENSSL_LIBS $OPENSSL_EXTRA_LIBS"
fi
-if test "z$OPENSSL_FOUND" = "zyes" -a "z$OPENSSL_VERSION" = "z" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl libraries >= $OPENSSL_MIN_VERSION" >&5
-$as_echo_n "checking for openssl libraries >= $OPENSSL_MIN_VERSION... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl library >= $OPENSSL_MIN_VERSION" >&5
+$as_echo_n "checking for openssl library >= $OPENSSL_MIN_VERSION... " >&6; }
+if test "z$OPENSSL_FOUND" = "zyes" ; then
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $OPENSSL_CFLAGS"
+ if test "z$OPENSSL_VERSION" = "z" ; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <openssl/opensslv.h>
+ #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L
+ greater-than-minvers
+ #endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "greater-than-minvers" >/dev/null 2>&1; then :
+
+ OPENSSL_VERSION="1.0.0 (LibreSSL < 2.7)"
+
+else
- OLD_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$OPENSSL_CFLAGS"
+ OPENSSL_VERSION=""
+
+fi
+rm -f conftest*
+
+ fi
if test "z$OPENSSL_VERSION" = "z" ; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <openssl/opensslv.h>
- #if OPENSSL_VERSION_NUMBER == 0x20000000L && defined(LIBRESSL_VERSION_NUMBER)
- yes
- #endif
+ #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
+ greater-than-minvers
+ #endif
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
+ $EGREP "greater-than-minvers" >/dev/null 2>&1; then :
- OPENSSL_VERSION="1.0.0 (libressl)"
+ OPENSSL_VERSION="1.1.0 (LibreSSL >= 2.7)"
else
- OPENSSL_VERSION=""
+ OPENSSL_VERSION=""
fi
rm -f conftest*
@@ -14692,19 +14872,19 @@ rm -f conftest*
/* end confdefs.h. */
#include <openssl/opensslv.h>
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L
- yes
- #endif
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ greater-than-minvers
+ #endif
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
+ $EGREP "greater-than-minvers" >/dev/null 2>&1; then :
- OPENSSL_VERSION="1.1.0"
+ OPENSSL_VERSION="1.1.0"
else
- OPENSSL_VERSION=""
+ OPENSSL_VERSION=""
fi
rm -f conftest*
@@ -14715,35 +14895,39 @@ rm -f conftest*
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #include <openssl/opensslv.h>
- #if OPENSSL_VERSION_NUMBER >= 0x10000000L
- yes
- #endif
+ #include <openssl/opensslv.h>
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ greater-than-minvers
+ #endif
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
+ $EGREP "greater-than-minvers" >/dev/null 2>&1; then :
- OPENSSL_VERSION="1.0.0"
+ OPENSSL_VERSION="1.0.0"
else
- OPENSSL_VERSION=""
+ OPENSSL_VERSION=""
fi
rm -f conftest*
fi
+ CPPFLAGS=$OLD_CPPFLAGS
- if test "z$OPENSSL_VERSION" = "z" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ if test "z$OPENSSL_VERSION" != "z" ; then
+ OPENSSL_FOUND=yes
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ('$OPENSSL_VERSION')" >&5
-$as_echo "yes ('$OPENSSL_VERSION')" >&6; }
+ OPENSSL_FOUND=no
fi
-
- CPPFLAGS=$OLD_CPPFLAGS
+fi
+if test "z$OPENSSL_FOUND" = "zyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (openssl version '$OPENSSL_VERSION')" >&5
+$as_echo "yes (openssl version '$OPENSSL_VERSION')" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL_FOUND" >&5
+$as_echo "$OPENSSL_FOUND" >&6; }
fi
if test "z$OPENSSL_FOUND" = "zyes" ; then
@@ -14754,7 +14938,7 @@ else
XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST openssl"
fi
- if test "z$XMLSEC_NO_OPENSSL" == "z1"; then
+ if test "z$XMLSEC_NO_OPENSSL" = "z1"; then
XMLSEC_NO_OPENSSL_TRUE=
XMLSEC_NO_OPENSSL_FALSE='#'
else
@@ -14768,21 +14952,27 @@ fi
-XMLSEC_NO_NSS="1"
-SEAMONKEY_MIN_VERSION="1.0"
-MOZILLA_MIN_VERSION="1.4"
NSS_MIN_VERSION="3.11.1"
NSPR_MIN_VERSION="4.4.1"
-NSS_CFLAGS=""
-NSS_LIBS=""
-NSS_LIBS_LIST="-lnss3 -lsmime3"
-NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
+SEAMONKEY_MIN_VERSION="1.0"
+MOZILLA_MIN_VERSION="1.4"
NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
-NSS_FOUND="no"
NSPR_PACKAGE=mozilla-nspr
NSS_PACKAGE=mozilla-nss
+NSPR_INCLUDE_MARKER="nspr/nspr.h"
+NSPR_LIB_MARKER="libnspr4$shrext"
+NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
+NSS_INCLUDE_MARKER="nss/nss.h"
+NSS_LIB_MARKER="libnss3$shrext"
+NSS_LIBS_LIST="-lnss3 -lsmime3"
-
+XMLSEC_NO_NSS="1"
+NSPR_INCLUDE_PATH=
+NSPR_LIB_PATH=
+NSS_INCLUDE_PATH=
+NSS_LIB_PATH=
+NSS_FOUND="no"
+NSPR_FOUND="no"
# Check whether --with-nss was given.
if test "${with_nss+set}" = set; then :
@@ -14807,14 +14997,342 @@ if test "${with_mozilla_ver+set}" = set; then :
withval=$with_mozilla_ver;
fi
+
if test "z$with_nss" = "zno" -o "z$with_nspr" = "zno" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS libraries" >&5
-$as_echo_n "checking for NSS libraries... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ NSS_FOUND="disabled"
+ NSPR_FOUND="disabled"
+fi
+
+if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nspr library installation in \"$with_nspr\" folder" >&5
+$as_echo_n "checking for nspr library installation in \"$with_nspr\" folder... " >&6; }
+ if test -f "$with_nspr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/lib/$NSPR_LIB_MARKER" ; then
+ NSPR_INCLUDE_PATH="$with_nspr/include"
+ NSPR_LIB_PATH="$with_nspr/lib"
+ NSPR_FOUND="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ as_fn_error $? "not found: \"$with_nspr/include/$NSPR_INCLUDE_MARKER\" and/or \"$with_nspr/lib/$NSPR_LIB_MARKER\" files don't exist), typo?" "$LINENO" 5
+ fi
+fi
+if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nss library installation in \"$with_nss\" folder" >&5
+$as_echo_n "checking for nss library installation in \"$with_nss\" folder... " >&6; }
+ if test -f "$with_nss/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/lib/$NSS_LIB_MARKER" ; then
+ NSS_INCLUDE_PATH="$with_nss/include"
+ NSS_LIB_PATH="$with_nss/lib"
+ NSS_FOUND="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ as_fn_error $? "not found: \"$with_nss/include/$NSS_INCLUDE_MARKER\" and/or \"$with_nss/lib/$NSS_LIB_MARKER\" files don't exist), typo?" "$LINENO" 5
+ fi
+fi
+
+if test "z$NSPR_FOUND" = "zno" -a "z$NSPR_CFLAGS" != "z" -a "z$NSPR_LIBS" != "z" ; then
+ NSPR_FOUND="yes"
+fi
+if test "z$NSS_FOUND" = "zno" -a "z$NSS_CFLAGS" != "z" -a "z$NSS_LIBS" != "z" ; then
+ NSS_FOUND="yes"
+fi
+
+if test "z$NSPR_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" -a "z$with_mozilla_ver" = "z" -a "z$with_seamonkey_ver" ; then
+ if test "z$NSPR_FOUND" = "zno" ; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSPR" >&5
+$as_echo_n "checking for NSPR... " >&6; }
+
+if test -n "$NSPR_CFLAGS"; then
+ pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"seamonkey-nspr >= \$NSPR_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "seamonkey-nspr >= $NSPR_MIN_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-nspr >= $NSPR_MIN_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$NSPR_LIBS"; then
+ pkg_cv_NSPR_LIBS="$NSPR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"seamonkey-nspr >= \$NSPR_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "seamonkey-nspr >= $NSPR_MIN_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "seamonkey-nspr >= $NSPR_MIN_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "seamonkey-nspr >= $NSPR_MIN_VERSION" 2>&1`
+ else
+ NSPR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "seamonkey-nspr >= $NSPR_MIN_VERSION" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$NSPR_PKG_ERRORS" >&5
+
+ NSPR_FOUND=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ NSPR_FOUND=no
+else
+ NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
+ NSPR_LIBS=$pkg_cv_NSPR_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ NSPR_FOUND=yes NSPR_PACKAGE=seamonkey-nspr
+fi
+ fi
+ if test "z$NSPR_FOUND" = "zno" ; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSPR" >&5
+$as_echo_n "checking for NSPR... " >&6; }
+
+if test -n "$NSPR_CFLAGS"; then
+ pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr >= \$MOZILLA_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "mozilla-nspr >= $MOZILLA_MIN_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nspr >= $MOZILLA_MIN_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$NSPR_LIBS"; then
+ pkg_cv_NSPR_LIBS="$NSPR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr >= \$MOZILLA_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "mozilla-nspr >= $MOZILLA_MIN_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "mozilla-nspr >= $MOZILLA_MIN_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mozilla-nspr >= $MOZILLA_MIN_VERSION" 2>&1`
+ else
+ NSPR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mozilla-nspr >= $MOZILLA_MIN_VERSION" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$NSPR_PKG_ERRORS" >&5
+
+ NSPR_FOUND=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ NSPR_FOUND=no
+else
+ NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
+ NSPR_LIBS=$pkg_cv_NSPR_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ NSPR_FOUND=yes NSPR_PACKAGE=mozilla-nspr
+fi
+ fi
+ if test "z$NSPR_FOUND" = "zno" ; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSPR" >&5
+$as_echo_n "checking for NSPR... " >&6; }
+
+if test -n "$NSPR_CFLAGS"; then
+ pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xulrunner-nspr >= \$NSPR_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xulrunner-nspr >= $NSPR_MIN_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-nspr >= $NSPR_MIN_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$NSPR_LIBS"; then
+ pkg_cv_NSPR_LIBS="$NSPR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xulrunner-nspr >= \$NSPR_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xulrunner-nspr >= $NSPR_MIN_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "xulrunner-nspr >= $NSPR_MIN_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xulrunner-nspr >= $NSPR_MIN_VERSION" 2>&1`
+ else
+ NSPR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xulrunner-nspr >= $NSPR_MIN_VERSION" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$NSPR_PKG_ERRORS" >&5
+
+ NSPR_FOUND=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- NSS_FOUND="without"
-elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$with_seamonkey_ver" = "z" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
- if test "z$NSS_FOUND" = "zno" ; then
+ NSPR_FOUND=no
+else
+ NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
+ NSPR_LIBS=$pkg_cv_NSPR_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ NSPR_FOUND=yes NSPR_PACKAGE=xulrunner-nspr
+fi
+ fi
+ if test "z$NSPR_FOUND" = "zno" ; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSPR" >&5
+$as_echo_n "checking for NSPR... " >&6; }
+
+if test -n "$NSPR_CFLAGS"; then
+ pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nspr >= \$NSPR_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "nspr >= $NSPR_MIN_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $NSPR_MIN_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$NSPR_LIBS"; then
+ pkg_cv_NSPR_LIBS="$NSPR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nspr >= \$NSPR_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "nspr >= $NSPR_MIN_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr >= $NSPR_MIN_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nspr >= $NSPR_MIN_VERSION" 2>&1`
+ else
+ NSPR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nspr >= $NSPR_MIN_VERSION" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$NSPR_PKG_ERRORS" >&5
+
+ NSPR_FOUND=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ NSPR_FOUND=no
+else
+ NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
+ NSPR_LIBS=$pkg_cv_NSPR_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ NSPR_FOUND=yes NSPR_PACKAGE=nspr
+fi
+ fi
+fi
+if test "z$NSS_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" -a "z$with_mozilla_ver" = "z" -a "z$with_seamonkey_ver" ; then
+ if test "z$NSS_FOUND" = "zno" ; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5
@@ -14824,12 +15342,12 @@ if test -n "$NSS_CFLAGS"; then
pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"seamonkey-nspr >= \$NSPR_MIN_VERSION seamonkey-nss >= \$SEAMONKEY_MIN_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "seamonkey-nspr >= $NSPR_MIN_VERSION seamonkey-nss >= $SEAMONKEY_MIN_VERSION") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"seamonkey-nss >= \$SEAMONKEY_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "seamonkey-nss >= $SEAMONKEY_MIN_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-nspr >= $NSPR_MIN_VERSION seamonkey-nss >= $SEAMONKEY_MIN_VERSION" 2>/dev/null`
+ pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-nss >= $SEAMONKEY_MIN_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14841,12 +15359,12 @@ if test -n "$NSS_LIBS"; then
pkg_cv_NSS_LIBS="$NSS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"seamonkey-nspr >= \$NSPR_MIN_VERSION seamonkey-nss >= \$SEAMONKEY_MIN_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "seamonkey-nspr >= $NSPR_MIN_VERSION seamonkey-nss >= $SEAMONKEY_MIN_VERSION") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"seamonkey-nss >= \$SEAMONKEY_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "seamonkey-nss >= $SEAMONKEY_MIN_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "seamonkey-nspr >= $NSPR_MIN_VERSION seamonkey-nss >= $SEAMONKEY_MIN_VERSION" 2>/dev/null`
+ pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "seamonkey-nss >= $SEAMONKEY_MIN_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14867,9 +15385,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "seamonkey-nspr >= $NSPR_MIN_VERSION seamonkey-nss >= $SEAMONKEY_MIN_VERSION" 2>&1`
+ NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "seamonkey-nss >= $SEAMONKEY_MIN_VERSION" 2>&1`
else
- NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "seamonkey-nspr >= $NSPR_MIN_VERSION seamonkey-nss >= $SEAMONKEY_MIN_VERSION" 2>&1`
+ NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "seamonkey-nss >= $SEAMONKEY_MIN_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$NSS_PKG_ERRORS" >&5
@@ -14884,7 +15402,7 @@ else
NSS_LIBS=$pkg_cv_NSS_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- NSS_FOUND=yes NSPR_PACKAGE=seamonkey-nspr NSS_PACKAGE=seamonkey-nss
+ NSS_FOUND=yes NSS_PACKAGE=seamonkey-nss
fi
fi
if test "z$NSS_FOUND" = "zno" ; then
@@ -14897,12 +15415,12 @@ if test -n "$NSS_CFLAGS"; then
pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr >= \$MOZILLA_MIN_VERSION mozilla-nss >= \$MOZILLA_MIN_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-nss >= \$MOZILLA_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "mozilla-nss >= $MOZILLA_MIN_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" 2>/dev/null`
+ pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nss >= $MOZILLA_MIN_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14914,12 +15432,12 @@ if test -n "$NSS_LIBS"; then
pkg_cv_NSS_LIBS="$NSS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr >= \$MOZILLA_MIN_VERSION mozilla-nss >= \$MOZILLA_MIN_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-nss >= \$MOZILLA_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "mozilla-nss >= $MOZILLA_MIN_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" 2>/dev/null`
+ pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "mozilla-nss >= $MOZILLA_MIN_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14940,9 +15458,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" 2>&1`
+ NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mozilla-nss >= $MOZILLA_MIN_VERSION" 2>&1`
else
- NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" 2>&1`
+ NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mozilla-nss >= $MOZILLA_MIN_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$NSS_PKG_ERRORS" >&5
@@ -14957,7 +15475,7 @@ else
NSS_LIBS=$pkg_cv_NSS_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- NSS_FOUND=yes NSPR_PACKAGE=mozilla-nspr NSS_PACKAGE=mozilla-nss
+ NSS_FOUND=yes NSS_PACKAGE=mozilla-nss
fi
fi
if test "z$NSS_FOUND" = "zno" ; then
@@ -14970,12 +15488,12 @@ if test -n "$NSS_CFLAGS"; then
pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xulrunner-nspr >= \$NSPR_MIN_VERSION xulrunner-nss >= \$NSS_MIN_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "xulrunner-nspr >= $NSPR_MIN_VERSION xulrunner-nss >= $NSS_MIN_VERSION") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xulrunner-nss >= \$NSS_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xulrunner-nss >= $NSS_MIN_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-nspr >= $NSPR_MIN_VERSION xulrunner-nss >= $NSS_MIN_VERSION" 2>/dev/null`
+ pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-nss >= $NSS_MIN_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14987,12 +15505,12 @@ if test -n "$NSS_LIBS"; then
pkg_cv_NSS_LIBS="$NSS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xulrunner-nspr >= \$NSPR_MIN_VERSION xulrunner-nss >= \$NSS_MIN_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "xulrunner-nspr >= $NSPR_MIN_VERSION xulrunner-nss >= $NSS_MIN_VERSION") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xulrunner-nss >= \$NSS_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xulrunner-nss >= $NSS_MIN_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "xulrunner-nspr >= $NSPR_MIN_VERSION xulrunner-nss >= $NSS_MIN_VERSION" 2>/dev/null`
+ pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "xulrunner-nss >= $NSS_MIN_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15013,9 +15531,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xulrunner-nspr >= $NSPR_MIN_VERSION xulrunner-nss >= $NSS_MIN_VERSION" 2>&1`
+ NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xulrunner-nss >= $NSS_MIN_VERSION" 2>&1`
else
- NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xulrunner-nspr >= $NSPR_MIN_VERSION xulrunner-nss >= $NSS_MIN_VERSION" 2>&1`
+ NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xulrunner-nss >= $NSS_MIN_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$NSS_PKG_ERRORS" >&5
@@ -15030,7 +15548,7 @@ else
NSS_LIBS=$pkg_cv_NSS_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- NSS_FOUND=yes NSPR_PACKAGE=xulrunner-nspr NSS_PACKAGE=xulrunner-nss
+ NSS_FOUND=yes NSS_PACKAGE=xulrunner-nss
fi
fi
if test "z$NSS_FOUND" = "zno" ; then
@@ -15043,12 +15561,12 @@ if test -n "$NSS_CFLAGS"; then
pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nspr >= \$NSPR_MIN_VERSION nss >= \$NSS_MIN_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss >= \$NSS_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "nss >= $NSS_MIN_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION" 2>/dev/null`
+ pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss >= $NSS_MIN_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15060,12 +15578,12 @@ if test -n "$NSS_LIBS"; then
pkg_cv_NSS_LIBS="$NSS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nspr >= \$NSPR_MIN_VERSION nss >= \$NSS_MIN_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss >= \$NSS_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "nss >= $NSS_MIN_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION" 2>/dev/null`
+ pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "nss >= $NSS_MIN_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15086,9 +15604,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION" 2>&1`
+ NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nss >= $NSS_MIN_VERSION" 2>&1`
else
- NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION" 2>&1`
+ NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nss >= $NSS_MIN_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$NSS_PKG_ERRORS" >&5
@@ -15103,197 +15621,266 @@ else
NSS_LIBS=$pkg_cv_NSS_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- NSS_FOUND=yes NSPR_PACKAGE=nspr NSS_PACKAGE=nss
+ NSS_FOUND=yes NSS_PACKAGE=nss
fi
fi
fi
-if test "z$NSS_FOUND" = "zno" ; then
- if test "z$with_seamonkey_ver" != "z" ; then
- ac_mozilla_name=seamonkey-$with_seamonkey_ver
- elif test "z$with_mozilla_ver" != "z" ; then
- ac_mozilla_name=mozilla-$with_mozilla_ver
+if test "z$with_seamonkey_ver" != "z" ; then
+ NSS_MOZILLA_NAME=seamonkey-$with_seamonkey_ver
+elif test "z$with_mozilla_ver" != "z" ; then
+ NSS_MOZILLA_NAME=mozilla-$with_mozilla_ver
+else
+ NSS_MOZILLA_NAME=mozilla-$MOZILLA_MIN_VERSION
+fi
+NSS_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/include/mozilla /usr/local/include/mozilla /usr/include/$NSS_MOZILLA_NAME /usr/local/include/$NSS_MOZILLA_NAME"
+NSS_LIB_DIR="$COMMON_LIB_DIR /usr/lib/$NSS_MOZILLA_NAME /usr/local/lib/$NSS_MOZILLA_NAME"
+if test "z$NSPR_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nspr library installation in the typical folders" >&5
+$as_echo_n "checking for nspr library installation in the typical folders... " >&6; }
+ if test "z$NSPR_INCLUDE_PATH" = "z" ; then
+
+ for dir in $NSS_INCLUDE_DIR ; do
+ if test -f "$dir/$NSPR_INCLUDE_MARKER" ; then
+ NSPR_INCLUDE_PATH="$dir"
+ break;
+ fi
+ done
+
+ fi
+ if test "z$NSPR_LIB_PATH" = "z" ; then
+
+ for dir in $NSS_LIB_DIR ; do
+ if test -f "$dir/$NSPR_LIB_MARKER" ; then
+ NSPR_LIB_PATH="$dir"
+ break;
+ fi
+ done
+
+ fi
+ if test "z$NSPR_INCLUDE_PATH" != "z" -a "z$NSPR_LIB_PATH" != "z" ; then
+ NSPR_FOUND=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (\"-I$NSPR_INCLUDE_PATH -L$NSPR_LIB_PATH\")" >&5
+$as_echo "yes (\"-I$NSPR_INCLUDE_PATH -L$NSPR_LIB_PATH\")" >&6; }
else
- ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
fi
+fi
+if test "z$NSS_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nss library installation in the typical folders" >&5
+$as_echo_n "checking for nss library installation in the typical folders... " >&6; }
+ if test "z$NSS_INCLUDE_PATH" = "z" ; then
- ac_nss_lib_dir="/usr/lib /usr/lib64 /usr/local/lib /usr/lib/$ac_mozilla_name /usr/local/lib/$ac_mozilla_name"
- ac_nss_inc_dir="/usr/include /usr/include/mozilla /usr/local/include /usr/local/include/mozilla /usr/include/$ac_mozilla_name /usr/local/include/$ac_mozilla_name"
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nspr libraries >= $NSPR_MIN_VERSION" >&5
-$as_echo_n "checking for nspr libraries >= $NSPR_MIN_VERSION... " >&6; }
- NSPR_INCLUDES_FOUND="no"
- NSPR_LIBS_FOUND="no"
- NSPR_FOUND="no"
- NSPR_PRINIT_H=""
-
- if test "z$with_nspr" != "z" ; then
- NSPR_PREFIX="$with_nspr"
- NSPR_CFLAGS="-I$with_nspr/include -I$with_nspr/include/nspr"
- if test "z$with_gnu_ld" = "zyes" ; then
- NSPR_LIBS="-Wl,-rpath-link -Wl,$with_nspr/lib -L$with_nspr/lib $NSPR_LIBS_LIST"
- else
- NSPR_LIBS="-L$with_nspr/lib $NSPR_LIBS_LIST"
- fi
- NSPR_INCLUDES_FOUND="yes"
- NSPR_LIBS_FOUND="yes"
- NSPR_PRINIT_H="$with_nspr/include/prinit.h"
+ for dir in $NSS_INCLUDE_DIR ; do
+ if test -f "$dir/$NSS_INCLUDE_MARKER" ; then
+ NSS_INCLUDE_PATH="$dir"
+ break;
+ fi
+ done
+
+ fi
+ if test "z$NSS_LIB_PATH" = "z" ; then
+
+ for dir in $NSS_LIB_DIR ; do
+ if test -f "$dir/$NSS_LIB_MARKER" ; then
+ NSS_LIB_PATH="$dir"
+ break;
+ fi
+ done
+
+ fi
+ if test "z$NSS_INCLUDE_PATH" != "z" -a "z$NSS_LIB_PATH" != "z" ; then
+ NSS_FOUND=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (\"-I$NSS_INCLUDE_PATH -L$NSS_LIB_PATH\")" >&5
+$as_echo "yes (\"-I$NSS_INCLUDE_PATH -L$NSS_LIB_PATH\")" >&6; }
else
- for dir in $ac_nss_inc_dir ; do
- if test -f $dir/nspr/prinit.h ; then
- if test "z$dir" = "z/usr/include" ; then
- NSPR_CFLAGS=""
- else
- NSPR_CFLAGS="-I$dir/nspr"
- fi
- NSPR_INCLUDES_FOUND="yes"
- NSPR_PRINIT_H="$dir/nspr/prinit.h"
- break
- fi
- done
-
- for dir in $ac_nss_lib_dir ; do
- if test -f $dir/libnspr4$shrext ; then
- if test "z$dir" = "z/usr/lib" ; then
- NSPR_LIBS="$NSPR_LIBS_LIST"
- else
- if test "z$with_gnu_ld" = "zyes" ; then
- NSPR_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSPR_LIBS_LIST"
- else
- NSPR_LIBS="-L$dir $NSPR_LIBS_LIST"
- fi
- fi
- NSPR_LIBS_FOUND="yes"
- break
- fi
- done
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
fi
+fi
- if test "z$NSPR_INCLUDES_FOUND" = "zyes" -a "z$NSPR_LIBS_FOUND" = "zyes" ; then
- OLD_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$NSPR_CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "z$NSPR_FOUND" = "zno" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nspr library installation" >&5
+$as_echo_n "checking for nspr library installation... " >&6; }
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $NSPR_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $NSPR_LIBS $NSPR_LIBS_LIST"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #include <prinit.h>
- #if PR_VMAJOR >= 4
- yes
- #endif
+
+ #include <stdio.h>
+ #include <nspr/nspr.h>
+
+int
+main ()
+{
+
+ int main () { printf("v=%s\n", PR_GetVersion()); return(0); }
+
+ ;
+ return 0;
+}
_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
+if ac_fn_c_try_link "$LINENO"; then :
- NSPR_FOUND=yes
+ NSPR_FOUND=yes
+ NSPR_LIBS="$NSPR_LIBS $NSPR_LIBS_LIST"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- NSPR_FOUND=no
+ NSPR_FOUND=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
fi
-rm -f conftest*
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
+fi
- CPPFLAGS="$OLD_CPPFLAGS"
+if test "z$NSPR_FOUND" = "zyes" -a "z$NSPR_INCLUDE_PATH" != "z" ; then
+ NSPR_CFLAGS="$NSPR_CFLAGS -I$NSPR_INCLUDE_PATH -I$NSPR_INCLUDE_PATH/nspr"
+fi
+if test "z$NSPR_FOUND" = "zyes" -a "z$NSPR_LIB_PATH" != "z" ; then
+ if test "z$with_gnu_ld" = "zyes" ; then
+ NSPR_LIBS="$NSPR_LIBS -Wl,-rpath-link -Wl,$NSPR_LIB_PATH"
fi
+ NSPR_LIBS="$NSPR_LIBS -L$NSPR_LIB_PATH/lib $NSPR_LIBS_LIST"
+fi
+
+if test "z$NSS_FOUND" = "zno" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nss library installation" >&5
+$as_echo_n "checking for nss library installation... " >&6; }
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $NSPR_CFLAGS $NSS_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $NSS_LIBS $NSPR_LIBS $NSS_LIBS_LIST"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+
+ #include <stdio.h>
+ #include <nss/nss.h>
+
+int
+main ()
+{
+
+ int main () { printf("v=%s\n", NSS_GetVersion()); return(0); }
+
+ ;
+ return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
- if test "z$NSPR_FOUND" = "zyes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ NSS_FOUND=yes
+ NSS_LIBS="$NSS_LIBS $NSS_LIBS_LIST"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nss libraries >= $NSS_MIN_VERSION" >&5
-$as_echo_n "checking for nss libraries >= $NSS_MIN_VERSION... " >&6; }
- NSS_INCLUDES_FOUND="no"
- NSS_LIBS_FOUND="no"
- NSS_NSS_H=""
+else
- if test "z$with_nss" != "z" ; then
- NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss"
- if test "z$with_gnu_ld" = "zyes" ; then
- NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST"
- else
- NSS_LIBS="$NSS_LIBS -L$with_nss/lib $NSS_LIBS_LIST"
- fi
- NSS_INCLUDES_FOUND="yes"
- NSS_LIBS_FOUND="yes"
- NSS_NSS_H="$with_nss/include/nss.h"
- else
- for dir in $ac_nss_inc_dir ; do
- if test -f $dir/nss/nss.h ; then
- if test "z$dir" = "z/usr/include" ; then
- NSS_CFLAGS="$NSS_CFLAGS"
- else
- NSS_CFLAGS="$NSS_CFLAGS -I$dir/nss"
- fi
- NSS_INCLUDES_FOUND="yes"
- NSS_NSS_H="$dir/nss/nss.h"
- break
- fi
- done
-
- for dir in $ac_nss_lib_dir ; do
- if test -f $dir/libnss3$shrext ; then
- if test "z$dir" = "z/usr/lib" ; then
- NSS_LIBS="$NSS_LIBS_LIST"
- else
- if test "z$with_gnu_ld" = "zyes" ; then
- NSS_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSS_LIBS_LIST"
- else
- NSS_LIBS="-L$dir $NSS_LIBS_LIST"
- fi
- fi
- NSS_LIBS_FOUND="yes"
- break
- fi
- done
+ NSS_FOUND=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
+fi
+
+if test "z$NSS_FOUND" = "zyes" -a "z$NSS_INCLUDE_PATH" != "z" ; then
+ NSS_CFLAGS="$NSS_CFLAGS -I$NSS_INCLUDE_PATH -I$NSS_INCLUDE_PATH/nss"
+fi
+if test "z$NSS_FOUND" = "zyes" -a "z$NSS_LIB_PATH" != "z" ; then
+ if test "z$with_gnu_ld" = "zyes" ; then
+ NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$NSS_LIB_PATH"
fi
+ NSS_LIBS="$NSS_LIBS -L$NSS_LIB_PATH/lib $NSS_LIBS_LIST"
+fi
- if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
- OLD_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$NSPR_CFLAGS $NSS_CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nspr library >= $NSPR_MIN_VERSION" >&5
+$as_echo_n "checking for nspr library >= $NSPR_MIN_VERSION... " >&6; }
+if test "z$NSPR_FOUND" = "zyes" ; then
+ minvers=`echo $NSPR_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 100 + $2) * 100 + $3;}'`
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $NSPR_CFLAGS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #include <nss.h>
- #if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2
- yes
- #endif
+ #include <prinit.h>
+ #if ((PR_VMAJOR * 100 + PR_VMINOR) * 100 + PR_VPATCH) >= $minvers
+ greater-than-minvers
+ #endif
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
+ $EGREP "greater-than-minvers" >/dev/null 2>&1; then :
- NSS_FOUND=yes
+ NSPR_FOUND=yes
else
- NSS_FOUND=no
+ NSPR_FOUND=no
fi
rm -f conftest*
- CPPFLAGS="$OLD_CPPFLAGS"
- fi
+ CPPFLAGS="$OLD_CPPFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NSPR_FOUND" >&5
+$as_echo "$NSPR_FOUND" >&6; }
- if test "z$NSS_FOUND" = "zyes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nss library >= $NSS_MIN_VERSION" >&5
+$as_echo_n "checking for nss library >= $NSS_MIN_VERSION... " >&6; }
+if test "z$NSS_FOUND" = "zyes" ; then
+ minvers=`echo $NSS_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 100 + $2) * 100 + $3;}'`
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $NSPR_CFLAGS $NSS_CFLAGS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <nss.h>
+ #if ((NSS_VMAJOR * 100 + NSS_VMINOR) * 100 + NSS_VPATCH) >= $minvers
+ greater-than-minvers
+ #endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "greater-than-minvers" >/dev/null 2>&1; then :
+
+ NSS_FOUND=yes
+
+else
+
+ NSS_FOUND=no
- if test "z$NSPR_FOUND" = "zyes" -a "z$NSS_FOUND" = "zyes" ; then
- NSS_CFLAGS="$NSS_CFLAGS $NSPR_CFLAGS"
- NSS_LIBS="$NSS_LIBS $NSPR_LIBS"
- elif test "z$NSPR_FOUND" != "zyes" -a "z$NSS_FOUND" = "zyes" ; then
- NSS_FOUND="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: NSPR library is required for NSS" >&5
-$as_echo "NSPR library is required for NSS" >&6; }
- fi
+fi
+rm -f conftest*
+
+ CPPFLAGS="$OLD_CPPFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NSS_FOUND" >&5
+$as_echo "$NSS_FOUND" >&6; }
+
+if test "z$NSPR_FOUND" = "zyes" -a "z$NSS_FOUND" = "zyes" ; then
+ NSS_CFLAGS="$NSS_CFLAGS $NSPR_CFLAGS"
+ NSS_LIBS="$NSS_LIBS $NSPR_LIBS"
+elif test "z$NSPR_FOUND" != "zyes" -a "z$NSS_FOUND" = "zyes" ; then
+ NSS_FOUND="no"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: NSPR library is required for NSS, ignoring NSS library we have found" >&5
+$as_echo "NSPR library is required for NSS, ignoring NSS library we have found" >&6; }
fi
if test "z$NSS_FOUND" = "zyes" ; then
@@ -15322,14 +15909,19 @@ fi
-
-GCRYPT_CONFIG="libgcrypt-config"
-XMLSEC_NO_GCRYPT="1"
GCRYPT_MIN_VERSION="1.4.0"
-GCRYPT_VERSION=""
-GCRYPT_CFLAGS=""
-GCRYPT_LIBS=""
+GCRYPT_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/local/gcrypt/include"
+GCRYPT_LIB_DIR="$COMMON_LIB_DIR /usr/local/gcrypt/lib"
+GCRYPT_CONFIG="libgcrypt-config"
+GCRYPT_INCLUDE_MARKER="gcrypt.h"
+GCRYPT_LIB_MARKER="libgcrypt$shrext"
GCRYPT_CRYPTO_LIB="$XMLSEC_PACKAGE-gcrypt"
+GCRYPT_LIBS_LIST="-lgcrypt"
+
+XMLSEC_NO_GCRYPT="1"
+GCRYPT_VERSION=
+GCRYPT_INCLUDE_PATH=
+GCRYPT_LIB_PATH=
GCRYPT_FOUND="no"
# Check whether --with-gcrypt was given.
@@ -15337,9 +15929,36 @@ if test "${with_gcrypt+set}" = set; then :
withval=$with_gcrypt;
fi
+
if test "z$with_gcrypt" = "zno" ; then
- GCRYPT_FOUND="without"
-elif test "z$with_gcrypt" = "z" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
+ GCRYPT_FOUND="disabled"
+fi
+
+if test "z$GCRYPT_FOUND" = "zno" -a "z$with_gcrypt" != "z" -a "z$with_gcrypt" != "zyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgcrypt library installation in \"$with_gcrypt\" folder" >&5
+$as_echo_n "checking for libgcrypt library installation in \"$with_gcrypt\" folder... " >&6; }
+ if test "z$ENABLE_CUSTOM_CONFIGS" = "zyes" -a -f "$with_gcrypt/bin/$GCRYPT_CONFIG" ; then
+ GCRYPT_CONFIG_PATH="$with_gcrypt/bin/$GCRYPT_CONFIG"
+ GCRYPT_FOUND="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ elif test -f "$with_gcrypt/include/$GCRYPT_INCLUDE_MARKER" -a -f "$with_gcrypt/lib/$GCRYPT_LIB_MARKER" ; then
+ GCRYPT_INCLUDE_PATH="$with_gcrypt/include"
+ GCRYPT_LIB_PATH="$with_gcrypt/lib"
+ GCRYPT_FOUND="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ as_fn_error $? "not found: \"$with_gcrypt/bin/$GCRYPT_CONFIG\" tool, or \"$with_gcrypt/include/$GCRYPT_INCLUDE_MARKER\" and/or \"$with_gcrypt/lib/$GCRYPT_LIB_MARKER\" files don't exist), typo?" "$LINENO" 5
+ fi
+fi
+
+if test "z$GCRYPT_FOUND" = "zno" -a "z$GCRYPT_CFLAGS" != "z" -a "z$GCRYPT_LIBS" != "z" ; then
+ GCRYPT_FOUND="yes"
+fi
+
+if test "z$GCRYPT_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
+ if test "z$GCRYPT_FOUND" = "zno" ; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCRYPT" >&5
@@ -15411,7 +16030,7 @@ else
$as_echo "yes" >&6; }
GCRYPT_FOUND=yes
fi
-
+ fi
if test "z$GCRYPT_FOUND" = "zno" ; then
pkg_failed=no
@@ -15422,12 +16041,12 @@ if test -n "$GCRYPT_CFLAGS"; then
pkg_cv_GCRYPT_CFLAGS="$GCRYPT_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgcrypt >= \$GCRYPT_MIN_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libgcrypt >= $GCRYPT_MIN_VERSION") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgcrypt20 >= \$GCRYPT_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libgcrypt20 >= $GCRYPT_MIN_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GCRYPT_CFLAGS=`$PKG_CONFIG --cflags "libgcrypt >= $GCRYPT_MIN_VERSION" 2>/dev/null`
+ pkg_cv_GCRYPT_CFLAGS=`$PKG_CONFIG --cflags "libgcrypt20 >= $GCRYPT_MIN_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15439,12 +16058,12 @@ if test -n "$GCRYPT_LIBS"; then
pkg_cv_GCRYPT_LIBS="$GCRYPT_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgcrypt >= \$GCRYPT_MIN_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libgcrypt >= $GCRYPT_MIN_VERSION") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgcrypt20 >= \$GCRYPT_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libgcrypt20 >= $GCRYPT_MIN_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GCRYPT_LIBS=`$PKG_CONFIG --libs "libgcrypt >= $GCRYPT_MIN_VERSION" 2>/dev/null`
+ pkg_cv_GCRYPT_LIBS=`$PKG_CONFIG --libs "libgcrypt20 >= $GCRYPT_MIN_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15465,9 +16084,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GCRYPT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgcrypt >= $GCRYPT_MIN_VERSION" 2>&1`
+ GCRYPT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgcrypt20 >= $GCRYPT_MIN_VERSION" 2>&1`
else
- GCRYPT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgcrypt >= $GCRYPT_MIN_VERSION" 2>&1`
+ GCRYPT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgcrypt20 >= $GCRYPT_MIN_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GCRYPT_PKG_ERRORS" >&5
@@ -15485,7 +16104,6 @@ $as_echo "yes" >&6; }
GCRYPT_FOUND=yes
fi
fi
-
if test "z$GCRYPT_FOUND" = "zno" ; then
pkg_failed=no
@@ -15559,44 +16177,265 @@ $as_echo "yes" >&6; }
GCRYPT_FOUND=yes
fi
fi
+ if test "z$GCRYPT_FOUND" = "zno" ; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCRYPT" >&5
+$as_echo_n "checking for GCRYPT... " >&6; }
+
+if test -n "$GCRYPT_CFLAGS"; then
+ pkg_cv_GCRYPT_CFLAGS="$GCRYPT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgcrypt >= \$GCRYPT_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libgcrypt >= $GCRYPT_MIN_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GCRYPT_CFLAGS=`$PKG_CONFIG --cflags "libgcrypt >= $GCRYPT_MIN_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GCRYPT_LIBS"; then
+ pkg_cv_GCRYPT_LIBS="$GCRYPT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgcrypt >= \$GCRYPT_MIN_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libgcrypt >= $GCRYPT_MIN_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GCRYPT_LIBS=`$PKG_CONFIG --libs "libgcrypt >= $GCRYPT_MIN_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
fi
-if test "z$GCRYPT_FOUND" = "zno" ; then
- if test "z$with_gcrypt" != "z" ; then
- GCRYPT_CONFIG=$with_gcrypt/bin/$GCRYPT_CONFIG
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GCRYPT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgcrypt >= $GCRYPT_MIN_VERSION" 2>&1`
+ else
+ GCRYPT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgcrypt >= $GCRYPT_MIN_VERSION" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GCRYPT_PKG_ERRORS" >&5
+
+ GCRYPT_FOUND=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ GCRYPT_FOUND=no
+else
+ GCRYPT_CFLAGS=$pkg_cv_GCRYPT_CFLAGS
+ GCRYPT_LIBS=$pkg_cv_GCRYPT_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ GCRYPT_FOUND=yes
+fi
fi
- if ! $GCRYPT_CONFIG --version > /dev/null 2>&1 ; then
- if test "z$with_gcrypt" != "z" ; then
- as_fn_error $? "Unable to find gcrypt at '$with_gcrypt'" "$LINENO" 5
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+fi
+
+if test "z$GCRYPT_FOUND" = "zno" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then
+ # Extract the first word of "$GCRYPT_CONFIG", so it can be a program name with args.
+set dummy $GCRYPT_CONFIG; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GCRYPT_CONFIG_PATH+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GCRYPT_CONFIG_PATH in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GCRYPT_CONFIG_PATH="$GCRYPT_CONFIG_PATH" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_GCRYPT_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+GCRYPT_CONFIG_PATH=$ac_cv_path_GCRYPT_CONFIG_PATH
+if test -n "$GCRYPT_CONFIG_PATH"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCRYPT_CONFIG_PATH" >&5
+$as_echo "$GCRYPT_CONFIG_PATH" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- fi
+fi
+
+
+ if test "z$GCRYPT_CONFIG_PATH" != "z" ; then
+ GCRYPT_FOUND="yes"
+ fi
+fi
+
+if test "z$GCRYPT_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgcrypt library installation in the typical folders" >&5
+$as_echo_n "checking for libgcrypt library installation in the typical folders... " >&6; }
+ if test "z$GCRYPT_INCLUDE_PATH" = "z" ; then
+
+ for dir in $GCRYPT_INCLUDE_DIR ; do
+ if test -f "$dir/$GCRYPT_INCLUDE_MARKER" ; then
+ GCRYPT_INCLUDE_PATH="$dir"
+ break;
+ fi
+ done
+
+ fi
+ if test "z$GCRYPT_LIB_PATH" = "z" ; then
+
+ for dir in $GCRYPT_LIB_DIR ; do
+ if test -f "$dir/$GCRYPT_LIB_MARKER" ; then
+ GCRYPT_LIB_PATH="$dir"
+ break;
+ fi
+ done
+
+ fi
+ if test "z$GCRYPT_INCLUDE_PATH" != "z" -a "z$GCRYPT_LIB_PATH" != "z" ; then
+ GCRYPT_FOUND="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (\"-I$GCRYPT_INCLUDE_PATH -L$GCRYPT_LIB_PATH\")" >&5
+$as_echo "yes (\"-I$GCRYPT_INCLUDE_PATH -L$GCRYPT_LIB_PATH\")" >&6; }
else
- vers=`$GCRYPT_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- minvers=`echo $GCRYPT_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- if test "$vers" -ge "$minvers" ; then
- GCRYPT_CFLAGS="$GCRYPT_CFLAGS `$GCRYPT_CONFIG --cflags`"
- GCRYPT_LIBS="$GCRYPT_LIBS `$GCRYPT_CONFIG --libs`"
- GCRYPT_FOUND=yes
- else
- as_fn_error $? "You need at least gcrypt $GCRYPT_MIN_VERSION for this version of $XMLSEC_PACKAGE" "$LINENO" 5
- fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+ fi
+fi
+
+if test "z$GCRYPT_FOUND" = "zno" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcrypt library installation" >&5
+$as_echo_n "checking for gcrypt library installation... " >&6; }
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $GCRYPT_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $GCRYPT_LIBS $GCRYPT_LIBS_LIST"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+
+ #include <gcrypt.h>
+
+int
+main ()
+{
+
+ int main () { printf("v=%s\n", gcry_check_version("0")); return(0); }
+
+ ;
+ return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+ GCRYPT_FOUND=yes
+ GCRYPT_LIBS="$GCRYPT_LIBS $GCRYPT_LIBS_LIST"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+ GCRYPT_FOUND=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
+fi
+
+if test "z$GCRYPT_FOUND" = "zyes" ; then
+ if test "z$GCRYPT_CONFIG_PATH" != "z" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then
+ if test "z$GCRYPT_CFLAGS" = "z" ; then
+ GCRYPT_CFLAGS="`$GCRYPT_CONFIG_PATH --cflags`"
+ fi
+ if test "z$GCRYPT_LIBS" = "z"; then
+ GCRYPT_LIBS="`$GCRYPT_CONFIG_PATH --libs`"
+ fi
+ GCRYPT_CONFIG=$GCRYPT_CONFIG_PATH
+ GCRYPT_FOUND="yes"
+ else
+ if test "z$GCRYPT_INCLUDE_PATH" != "z" ; then
+ GCRYPT_CFLAGS="$GCRYPT_CFLAGS -I$GCRYPT_INCLUDE_PATH"
+ fi
+ if test "z$GCRYPT_LIB_PATH" != "z" ; then
+ if test "z$with_gnu_ld" = "zyes" ; then
+ GCRYPT_LIBS="$GCRYPT_LIBS -Wl,-rpath-link -Wl,$GCRYPT_LIB_PATH"
+ fi
+ GCRYPT_LIBS="$GCRYPT_LIBS -L$GCRYPT_LIB_PATH $GCRYPT_LIBS_LIST"
+ fi
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcrypt libraries >= $GCRYPT_MIN_VERSION" >&5
-$as_echo_n "checking for gcrypt libraries >= $GCRYPT_MIN_VERSION... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgcrypt library >= $GCRYPT_MIN_VERSION" >&5
+$as_echo_n "checking for libgcrypt library >= $GCRYPT_MIN_VERSION... " >&6; }
+if test "z$GCRYPT_FOUND" = "zyes" ; then
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $GCRYPT_CFLAGS"
+ minvers=`echo $GCRYPT_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 256 + $2) * 256 + $3;}'`
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <gcrypt.h>
+ #if GCRYPT_VERSION_NUMBER >= $minvers
+ greater-than-minvers
+ #endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "greater-than-minvers" >/dev/null 2>&1; then :
+
+ GCRYPT_FOUND=yes
+
+else
+
+ GCRYPT_FOUND=no
+
+fi
+rm -f conftest*
+
+ CPPFLAGS=$OLD_CPPFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCRYPT_FOUND" >&5
+$as_echo "$GCRYPT_FOUND" >&6; }
+
if test "z$GCRYPT_FOUND" = "zyes" ; then
XMLSEC_NO_GCRYPT="0"
GCRYPT_CFLAGS="$GCRYPT_CFLAGS -DXMLSEC_CRYPTO_GCRYPT=1"
XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST gcrypt"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
else
XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST gcrypt"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
fi
if test "z$XMLSEC_NO_GCRYPT" = "z1"; then
@@ -15613,13 +16452,17 @@ fi
-
-XMLSEC_NO_GNUTLS="1"
GNUTLS_MIN_VERSION="2.8.0"
-GNUTLS_VERSION=""
-GNUTLS_CFLAGS=""
-GNUTLS_LIBS=""
+GNUTLS_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/local/gnutls/include"
+GNUTLS_LIB_DIR="$COMMON_LIB_DIR /usr/local/gnutls/lib"
+GNUTLS_INCLUDE_MARKER="gnutls/gnutls.h"
+GNUTLS_LIB_MARKER="libgnutls$shrext"
GNUTLS_CRYPTO_LIB="$XMLSEC_PACKAGE-gnutls"
+GNUTLS_LIBS_LIST="-lgnutls"
+
+XMLSEC_NO_GNUTLS="1"
+GNUTLS_INCLUDE_PATH=
+GNUTLS_LIB_PATH=
GNUTLS_FOUND="no"
# Check whether --with-gnutls was given.
@@ -15627,9 +16470,31 @@ if test "${with_gnutls+set}" = set; then :
withval=$with_gnutls;
fi
+
if test "z$with_gnutls" = "zno" ; then
- GNUTLS_FOUND="without"
-elif test "z$with_gnutls" = "z" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
+ GNUTLS_FOUND="disabled"
+fi
+
+if test "z$GNUTLS_FOUND" = "zno" -a "z$with_gnutls" != "z" -a "z$with_gnutls" != "zyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgnutls library installation in \"$with_gnutls\" folder" >&5
+$as_echo_n "checking for libgnutls library installation in \"$with_gnutls\" folder... " >&6; }
+ if test -f "$with_gnutls/include/$GNUTLS_INCLUDE_MARKER" -a -f "$with_gnutls/lib/$GNUTLS_LIB_MARKER" ; then
+ GNUTLS_INCLUDE_PATH="$with_gnutls/include"
+ GNUTLS_LIB_PATH="$with_gnutls/lib"
+ GNUTLS_FOUND="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ as_fn_error $? "not found: \"$with_gnutls/bin/$GNUTLS_CONFIG\" tool, or \"$with_gnutls/include/$GNUTLS_INCLUDE_MARKER\" and/or \"$with_gnutls/lib/$GNUTLS_LIB_MARKER\" files don't exist), typo?" "$LINENO" 5
+ fi
+fi
+
+if test "z$GNUTLS_FOUND" = "zno" -a "z$GNUTLS_CFLAGS" != "z" -a "z$GNUTLS_LIBS" != "z" ; then
+ GNUTLS_FOUND="yes"
+fi
+
+if test "z$GNUTLS_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
+ if test "z$GNUTLS_FOUND" = "zno" ; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5
@@ -15701,6 +16566,7 @@ else
$as_echo "yes" >&6; }
GNUTLS_FOUND=yes
fi
+ fi
if test "z$GNUTLS_FOUND" = "zno" ; then
pkg_failed=no
@@ -15776,92 +16642,139 @@ fi
fi
fi
-if test "z$GNUTLS_FOUND" = "zno" ; then
- SAVE_CFLAGS="$CFLAGS"
- SAVE_LDFLAGS="$LDFLAGS"
- if test "z$with_gnutls" != "z" -a "z$with_gnutls" != "zno" ; then
- GNUTLS_CFLAGS="-I$with_gnutls/include"
- GNUTLS_LIBS="-L$with_gnutls/lib -lgnutls"
- CFLAGS="$GNUTLS_CFLAGS $CFLAGS"
- LDFLAGS="$GNUTLS_LIBS $LDFLAGS"
+if test "z$GNUTLS_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgnutls library installation in the typical folders" >&5
+$as_echo_n "checking for libgnutls library installation in the typical folders... " >&6; }
+ if test "z$GNUTLS_INCLUDE_PATH" = "z" ; then
+
+ for dir in $GNUTLS_INCLUDE_DIR ; do
+ if test -f "$dir/$GNUTLS_INCLUDE_MARKER" ; then
+ GNUTLS_INCLUDE_PATH="$dir"
+ break;
+ fi
+ done
+
fi
- for ac_header in gnutls/gnutls.h
-do :
- ac_fn_c_check_header_compile "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_GNUTLS_GNUTLS_H 1
-_ACEOF
+ if test "z$GNUTLS_LIB_PATH" = "z" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_check_version in -lgnutls" >&5
-$as_echo_n "checking for gnutls_check_version in -lgnutls... " >&6; }
-if ${ac_cv_lib_gnutls_gnutls_check_version+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgnutls $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ for dir in $GNUTLS_LIB_DIR ; do
+ if test -f "$dir/$GNUTLS_LIB_MARKER" ; then
+ GNUTLS_LIB_PATH="$dir"
+ break;
+ fi
+ done
+
+ fi
+ if test "z$GNUTLS_INCLUDE_PATH" != "z" -a "z$GNUTLS_LIB_PATH" != "z" ; then
+ GNUTLS_FOUND="yes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (\"-I$GNUTLS_INCLUDE_PATH -L$GNUTLS_LIB_PATH\")" >&5
+$as_echo "yes (\"-I$GNUTLS_INCLUDE_PATH -L$GNUTLS_LIB_PATH\")" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+ fi
+fi
+
+if test "z$GNUTLS_FOUND" = "zno" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls library installation" >&5
+$as_echo_n "checking for gnutls library installation... " >&6; }
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $GCRYPT_CFLAGS $GNUTLS_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $GNUTLS_LIBS $GCRYPT_LIBS $GNUTLS_LIBS_LIST"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gnutls_check_version ();
+
+ #include <gnutls/gnutls.h>
+
int
main ()
{
-return gnutls_check_version ();
+
+ int main () { gnutls_global_init(); return(0); }
+
;
return 0;
}
+
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gnutls_gnutls_check_version=yes
+
+ GNUTLS_FOUND=yes
+ GNUTLS_LIBS="$GNUTLS_LIBS $GNUTLS_LIBS_LIST"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
else
- ac_cv_lib_gnutls_gnutls_check_version=no
+
+ GNUTLS_FOUND=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_gnutls_check_version" >&5
-$as_echo "$ac_cv_lib_gnutls_gnutls_check_version" >&6; }
-if test "x$ac_cv_lib_gnutls_gnutls_check_version" = xyes; then :
- GNUTLS_FOUND=yes
+
+if test "z$GNUTLS_FOUND" = "zyes" ; then
+ if test "z$GNUTLS_INCLUDE_PATH" != "z" ; then
+ GNUTLS_CFLAGS="$GNUTLS_CFLAGS -I$GNUTLS_INCLUDE_PATH"
+ fi
+ if test "z$GNUTLS_LIB_PATH" != "z" ; then
+ if test "z$with_gnu_ld" = "zyes" ; then
+ GNUTLS_LIBS="$GNUTLS_LIBS -Wl,-rpath-link -Wl,$GNUTLS_LIB_PATH"
+ fi
+ GNUTLS_LIBS="$GNUTLS_LIBS -L$GNUTLS_LIB_PATH $GNUTLS_LIBS_LIST"
+ fi
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgnutls library >= $GNUTLS_MIN_VERSION" >&5
+$as_echo_n "checking for libgnutls library >= $GNUTLS_MIN_VERSION... " >&6; }
+if test "z$GNUTLS_FOUND" = "zyes" ; then
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $GNUTLS_CFLAGS"
+ minvers=`echo $GNUTLS_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 256 + $2) * 256 + $3;}'`
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <gnutls/gnutls.h>
+ #if GNUTLS_VERSION_NUMBER >= $minvers
+ greater-than-minvers
+ #endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "greater-than-minvers" >/dev/null 2>&1; then :
+
+ GNUTLS_FOUND=yes
+
+else
+
+ GNUTLS_FOUND=no
fi
+rm -f conftest*
-done
+ CPPFLAGS=$OLD_CPPFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUTLS_FOUND" >&5
+$as_echo "$GNUTLS_FOUND" >&6; }
- if test "z$with_gnutls" != "z" -a "z$with_gnutls" != "zno" -a "z$GNUTLS_FOUND" != "zyes" ; then
- as_fn_error $? "can't find usable libgnutls at specified location \"$with_gnutls\"" "$LINENO" 5
- fi
- CFLAGS="$SAVE_CFLAGS"
- LDFLAGS="$SAVE_LDFLAGS"
+if test "z$GNUTLS_FOUND" = "zyes" -a "z$GCRYPT_FOUND" != "zyes" ; then
+ GNUTLS_FOUND="no"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: xmlsec-gnutls library requires xmlsec-gcrypt library which is disabled or missing, ignoring libgnutls library we have found" >&5
+$as_echo "xmlsec-gnutls library requires xmlsec-gcrypt library which is disabled or missing, ignoring libgnutls library we have found" >&6; }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls libraries >= $GNUTLS_MIN_VERSION" >&5
-$as_echo_n "checking for gnutls libraries >= $GNUTLS_MIN_VERSION... " >&6; }
if test "z$GNUTLS_FOUND" = "zyes" ; then
XMLSEC_NO_GNUTLS="0"
GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DXMLSEC_CRYPTO_GNUTLS=1"
XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST gnutls"
-
- if test "z$GCRYPT_FOUND" != "zyes" ; then
- as_fn_error $? "xmlsec-gnutls library requires xmlsec-gcrypt library which is disabled or missing" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
else
XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST gnutls"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
fi
if test "z$XMLSEC_NO_GNUTLS" = "z1"; then
@@ -15879,67 +16792,92 @@ fi
-XMLSEC_NO_MSCRYPTO="1"
-MSCRYPTO_CFLAGS=""
-MSCRYPTO_LIBS=""
MSCRYPTO_CRYPTO_LIB="$XMLSEC_PACKAGE-mscrypto"
-MSCRYPTO_ENABLE='none'
+case $host in
+*-w64-mingw*)
+ MSCRYPTO_XMLSEC_DEFINES=
+ MSCRYPTO_LIBS_LIST="-lcrypt32"
+ ;;
+*-*-mingw*)
+ MSCRYPTO_XMLSEC_DEFINES="-DXMLSEC_CUSTOM_CRYPT32=1"
+ MSCRYPTO_LIBS_LIST="-Wl,$(srcdir)/mingw-crypt32.def"
+ ;;
+*)
+ MSCRYPTO_XMLSEC_DEFINES=
+ MSCRYPTO_LIBS_LIST="-lcrypt32"
+ ;;
+esac
+
+XMLSEC_NO_MSCRYPTO="1"
+MSCRYPTO_FOUND="no"
# Check whether --enable-mscrypto was given.
if test "${enable_mscrypto+set}" = set; then :
- enableval=$enable_mscrypto; MSCRYPTO_ENABLE=$enableval
+ enableval=$enable_mscrypto;
fi
-if test "z$MSCRYPTO_ENABLE" != "zyes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mscrypto libraries" >&5
-$as_echo_n "checking for mscrypto libraries... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSCRYPTO_ENABLE" >&5
-$as_echo "$MSCRYPTO_ENABLE" >&6; }
-else
- LIBS_SAVE="$LIBS"
- LIBS="$LIBS -lcrypt32"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mscrypto libraries" >&5
-$as_echo_n "checking for mscrypto libraries... " >&6; }
+
+if test "z$enable_mscrypto" = "zno" ; then
+ MSCRYPTO_FOUND="disabled"
+fi
+
+if test "z$MSCRYPTO_FOUND" = "zno" -a "z$MSCRYPTO_CFLAGS" != "z" -a "z$MSCRYPTO_LIBS" != "z" ; then
+ MSCRYPTO_FOUND=yes
+fi
+
+if test "z$MSCRYPTO_FOUND" = "zno" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mscrypto" >&5
+$as_echo_n "checking for mscrypto... " >&6; }
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $MSCRYPTO_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $MSCRYPTO_LIBS $MSCRYPTO_LIBS_LIST"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #include <windows.h>
- #include <wincrypt.h>
+
+ #include <windows.h>
+ #include <wincrypt.h>
+
int
main ()
{
- int main () { CertOpenStore(0,0,0,0,0);; return(0); }
+ int main () { CertOpenStore(0,0,0,0,0);; return(0); }
;
return 0;
}
+
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
+ MSCRYPTO_FOUND=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
else
- MSCRYPTO_ENABLE="no"
+
+ MSCRYPTO_FOUND=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSCRYPTO_ENABLE" >&5
-$as_echo "$MSCRYPTO_ENABLE" >&6; }
- LIBS="$LIBS_SAVE"
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
fi
-if test "z$MSCRYPTO_ENABLE" = "zyes" ; then
- XMLSEC_NO_MSCRYPTO="0"
+if test "z$MSCRYPTO_FOUND" = "zyes" ; then
+ if test "z$MSCRYPTO_CFLAGS" = "z" -o "z$MSCRYPTO_LIBS" = "z" ; then
+ XMLSEC_DEFINES="$XMLSEC_DEFINES $MSCRYPTO_XMLSEC_DEFINES"
+ MSCRYPTO_LIBS="$MSCRYPTO_LIBS $MSCRYPTO_LIBS_LIST"
+ fi
+fi
+if test "z$MSCRYPTO_FOUND" = "zyes" ; then
+ XMLSEC_NO_MSCRYPTO="0"
MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1"
- case $host in
- *-w64-mingw*)
- MSCRYPTO_LIBS="-lcrypt32";;
- *-*-mingw*)
- XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_CUSTOM_CRYPT32=1"
- MSCRYPTO_LIBS='-Wl,$(srcdir)/mingw-crypt32.def';;
- *)
- MSCRYPTO_LIBS="-lcrypt32";;
- esac
-
XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST mscrypto"
else
XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST mscrypto"
@@ -15959,6 +16897,103 @@ fi
+MSCNG_CRYPTO_LIB="$XMLSEC_PACKAGE-mscng"
+MSCNG_XMLSEC_DEFINES=
+MSCNG_LIBS_LIST="-lcrypt32 -lbcrypt -lncrypt"
+
+XMLSEC_NO_MSCNG="1"
+MSCNG_FOUND="no"
+# Check whether --enable-mscng was given.
+if test "${enable_mscng+set}" = set; then :
+ enableval=$enable_mscng;
+fi
+
+
+if test "z$enable_mscng" = "zno" ; then
+ MSCNG_FOUND="disabled"
+fi
+
+if test "z$MSCNG_FOUND" = "zno" -a "z$MSCNG_CFLAGS" != "z" -a "z$MSCNG_LIBS" != "z" ; then
+ MSCNG_FOUND=yes
+fi
+
+if test "z$MSCNG_FOUND" = "zno" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mscng" >&5
+$as_echo_n "checking for mscng... " >&6; }
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $MSCNG_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $MSCNG_LIBS $MSCNG_LIBS_LIST"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+
+ #include <windows.h>
+ #include <wincrypt.h>
+
+int
+main ()
+{
+
+ int main () {
+ BCRYPT_ALG_HANDLE hAlg;
+ BCryptOpenAlgorithmProvider(&hAlg, BCRYPT_SHA256_ALGORITHM, NULL, 0);
+ return(0);
+ }
+
+ ;
+ return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+ MSCNG_FOUND=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+ MSCNG_FOUND=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
+fi
+
+if test "z$MSCNG_FOUND" = "zyes" ; then
+ if test "z$MSCNG_CFLAGS" = "z" -o "z$MSCNG_LIBS" = "z" ; then
+ XMLSEC_DEFINES="$XMLSEC_DEFINES $MSCNG_XMLSEC_DEFINES"
+ MSCNG_LIBS="$MSCNG_LIBS $MSCNG_LIBS_LIST"
+ fi
+fi
+
+if test "z$MSCNG_FOUND" = "zyes" ; then
+ XMLSEC_NO_MSCNG="0"
+ MSCNG_CFLAGS="$MSCNG_CFLAGS -DXMLSEC_CRYPTO_MSCNG=1"
+ XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST mscng"
+else
+ XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST mscng"
+fi
+
+ if test "z$XMLSEC_NO_MSCNG" = "z1"; then
+ XMLSEC_NO_MSCNG_TRUE=
+ XMLSEC_NO_MSCNG_FALSE='#'
+else
+ XMLSEC_NO_MSCNG_TRUE='#'
+ XMLSEC_NO_MSCNG_FALSE=
+fi
+
+
+
+
+
+
+
XMLSEC_DEFAULT_CRYPTO=""
XMLSEC_CRYPTO_LIB=""
XMLSEC_CRYPTO_CFLAGS=""
@@ -15981,6 +17016,13 @@ case "z$with_default_crypto" in
as_fn_error $? "'$with_default_crypto' is specified as default crypto library but it is not configured or found" "$LINENO" 5
fi
;;
+ 'zmscng')
+ if test "z$XMLSEC_NO_MSCNG" != "z1" ; then
+ XMLSEC_DEFAULT_CRYPTO="mscng"
+ else
+ as_fn_error $? "'$with_default_crypto' is specified as default crypto library but it is not configured or found" "$LINENO" 5
+ fi
+ ;;
'zopenssl')
if test "z$XMLSEC_NO_OPENSSL" != "z1" ; then
XMLSEC_DEFAULT_CRYPTO="openssl"
@@ -16012,6 +17054,8 @@ case "z$with_default_crypto" in
'z')
if test "z$XMLSEC_NO_MSCRYPTO" != "z1" ; then
XMLSEC_DEFAULT_CRYPTO="mscrypto"
+ elif test "z$XMLSEC_NO_MSCNG" != "z1" ; then
+ XMLSEC_DEFAULT_CRYPTO="mscng"
elif test "z$XMLSEC_NO_OPENSSL" != "z1" ; then
XMLSEC_DEFAULT_CRYPTO="openssl"
elif test "z$XMLSEC_NO_NSS" != "z1" ; then
@@ -16035,6 +17079,11 @@ case "$XMLSEC_DEFAULT_CRYPTO" in
XMLSEC_CRYPTO_CFLAGS="$MSCRYPTO_CFLAGS"
XMLSEC_CRYPTO_LIBS="$MSCRYPTO_LIBS"
;;
+ 'mscng')
+ XMLSEC_CRYPTO_LIB="$MSCNG_CRYPTO_LIB"
+ XMLSEC_CRYPTO_CFLAGS="$MSCNG_CFLAGS"
+ XMLSEC_CRYPTO_LIBS="$MSCNG_LIBS"
+ ;;
'openssl')
XMLSEC_CRYPTO_LIB="$OPENSSL_CRYPTO_LIB"
XMLSEC_CRYPTO_CFLAGS="$OPENSSL_CFLAGS"
@@ -16059,8 +17108,8 @@ case "$XMLSEC_DEFAULT_CRYPTO" in
as_fn_error $? "The value \"$XMLSEC_DEFAULT_CRYPTO\" is not a recongnized crypto library name" "$LINENO" 5
;;
esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ('$XMLSEC_DEFAULT_CRYPTO')" >&5
-$as_echo "yes ('$XMLSEC_DEFAULT_CRYPTO')" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (\"$XMLSEC_DEFAULT_CRYPTO\")" >&5
+$as_echo "yes (\"$XMLSEC_DEFAULT_CRYPTO\")" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 support" >&5
$as_echo_n "checking for MD5 support... " >&6; }
@@ -16072,8 +17121,8 @@ fi
if test "z$enable_md5" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_MD5=1"
XMLSEC_NO_MD5="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_NO_MD5="0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16099,8 +17148,8 @@ fi
if test "z$enable_ripemd160" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_RIPEMD160=1"
XMLSEC_NO_RIPEMD160="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_NO_RIPEMD160="0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16126,8 +17175,8 @@ fi
if test "z$enable_sha1" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA1=1"
XMLSEC_NO_SHA1="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_NO_SHA1="0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16153,8 +17202,8 @@ fi
if test "z$enable_sha224" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA224=1"
XMLSEC_NO_SHA224="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_NO_SHA224="0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16180,8 +17229,8 @@ fi
if test "z$enable_sha256" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA256=1"
XMLSEC_NO_SHA256="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_NO_SHA256="0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16207,8 +17256,8 @@ fi
if test "z$enable_sha384" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA384=1"
XMLSEC_NO_SHA384="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_NO_SHA384="0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16234,8 +17283,8 @@ fi
if test "z$enable_sha512" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA512=1"
XMLSEC_NO_SHA512="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_NO_SHA512="0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16262,8 +17311,8 @@ fi
if test "z$enable_hmac" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_HMAC=1"
XMLSEC_NO_HMAC="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_NO_HMAC="0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16289,8 +17338,8 @@ fi
if test "z$enable_dsa" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_DSA=1"
XMLSEC_NO_DSA="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_NO_DSA="0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16316,8 +17365,8 @@ fi
if test "z$enable_rsa" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_RSA=1"
XMLSEC_NO_RSA="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_NO_RSA="0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16343,8 +17392,8 @@ fi
if test "z$enable_x509" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_X509=1"
XMLSEC_NO_X509="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_NO_X509="0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16370,8 +17419,8 @@ fi
if test "z$enable_des" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_DES=1"
XMLSEC_NO_DES="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_NO_DES="0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16397,8 +17446,8 @@ fi
if test "z$enable_aes" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_AES=1"
XMLSEC_NO_AES="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_NO_AES="0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16424,8 +17473,8 @@ fi
if test "z$enable_gost" != "zyes" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_GOST=1"
XMLSEC_NO_GOST="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_NO_GOST="0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16452,8 +17501,8 @@ fi
if test "z$enable_gost2012" != "zyes" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_GOST2012=1"
XMLSEC_NO_GOST2012="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_NO_GOST2012="0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16480,8 +17529,8 @@ fi
if test "z$enable_xmldsig" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XMLDSIG=1"
XMLSEC_NO_XMLDSIG="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_NO_XMLDSIG="0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16507,8 +17556,8 @@ fi
if test "z$enable_xmlenc" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XMLENC=1"
XMLSEC_NO_XMLENC="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_NO_XMLENC="0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16537,8 +17586,8 @@ if test "z$enable_soap" = "zyes" ; then
$as_echo "yes" >&6; }
else
XMLSEC_ENABLE_SOAP="0"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
fi
if test "z$XMLSEC_ENABLE_SOAP" = "z1"; then
XMLSEC_ENABLE_SOAP_TRUE=
@@ -16558,8 +17607,8 @@ fi
if test "z$enable_docs" = "zno" ; then
XMLSEC_DOCS="0"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_DOCS="1"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16584,8 +17633,8 @@ fi
if test "z$enable_apps" = "zno" ; then
XMLSEC_APPS="0"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
XMLSEC_APPS="1"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -16616,31 +17665,31 @@ if test "z$enable_static_linking" = "zyes" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
fi
XMLSEC_DL_INCLUDES=""
XMLSEC_DL_LIBS=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlsec-crypto dynamic loading support" >&5
-$as_echo_n "checking for xmlsec-crypto dynamic loading support... " >&6; }
# Check whether --enable-crypto_dl was given.
if test "${enable_crypto_dl+set}" = set; then :
enableval=$enable_crypto_dl;
fi
if test "z$enable_crypto_dl" = "zno" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlsec-crypto dynamic loading support" >&5
+$as_echo_n "checking for xmlsec-crypto dynamic loading support... " >&6; }
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_CRYPTO_DYNAMIC_LOADING=1"
XMLSEC_NO_CRYPTO_DYNAMIC_LOADING="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
if test "x$ac_cv_header_ltdl_h" = xyes; then :
- XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_DL_LIBLTDL=1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlopenext in -lltdl" >&5
+ XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_DL_LIBLTDL=1"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlopenext in -lltdl" >&5
$as_echo_n "checking for lt_dlopenext in -lltdl... " >&6; }
if ${ac_cv_lib_ltdl_lt_dlopenext+:} false; then :
$as_echo_n "(cached) " >&6
@@ -16683,21 +17732,25 @@ else
fi
+
else
- LIBLTDL=
+
+ LIBLTDL=
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlsec-crypto dynamic loading support" >&5
+$as_echo_n "checking for xmlsec-crypto dynamic loading support... " >&6; }
if test "z$LIBLTDL" != "z" ; then
- XMLSEC_DL_INCLUDES="$INCLTDL"
- XMLSEC_DL_LIBS="$LIBLTDL"
- XMLSEC_NO_CRYPTO_DYNAMIC_LOADING="0"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ XMLSEC_DL_INCLUDES="$INCLTDL"
+ XMLSEC_DL_LIBS="$LIBLTDL"
+ XMLSEC_NO_CRYPTO_DYNAMIC_LOADING="0"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- as_fn_error $? "libltdl is required for xmlsec-crypto dynamic loading" "$LINENO" 5
+ as_fn_error $? "libltdl is required for xmlsec-crypto dynamic loading" "$LINENO" 5
fi
fi
if test "z$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING" = "z1"; then
@@ -16724,11 +17777,11 @@ if test "z$enable_apps_crypto_dl" = "z" ; then
fi
if test "z$enable_apps_crypto_dl" = "zno" ; then
XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING="1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
elif test "z$enable_crypto_dl" = "zno" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
as_fn_error $? "xmlsec-crypto libraries dynamic loading support in xmlsec command line tool is requested but no dynamic loading in xmlsec itself is disabled" "$LINENO" 5
else
XMLSEC_APP_DEFINES="$XMLSEC_APP_DEFINES -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1"
@@ -16773,8 +17826,8 @@ fi
if test "z$enable_skm" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SKM_TEST=1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -16789,8 +17842,8 @@ fi
if test "z$enable_tmpl_tests" = "zyes" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_TMPL_TEST=1"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -16808,8 +17861,24 @@ if test "z$enable_debugging" = "zyes" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for warnings as errors" >&5
+$as_echo_n "checking for warnings as errors... " >&6; }
+# Check whether --enable-werror was given.
+if test "${enable_werror+set}" = set; then :
+ enableval=$enable_werror;
+fi
+
+if test "z$enable_werror" = "zyes" ; then
+ CFLAGS="$CFLAGS -Werror"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for profiling" >&5
@@ -16824,8 +17893,8 @@ if test "z$enable_profiling" = "zyes" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pedantic" >&5
@@ -16840,8 +17909,8 @@ if test "z$enable_pedantic" = "zyes" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
fi
XMLSEC_CORE_CFLAGS="$XMLSEC_DEFINES -I${includedir}/xmlsec1 $XMLSEC_DL_INCLUDES"
@@ -16874,6 +17943,7 @@ XMLSEC_NSS_LIBS="-L${libdir} -l$NSS_CRYPTO_LIB $XMLSEC_CORE_LIBS $NSS_LIBS"
+
XMLSEC_CFLAGS="$XMLSEC_CORE_CFLAGS $LIBXML_CFLAGS $LIBXSLT_CFLAGS $XMLSEC_CRYPTO_CFLAGS"
XMLSEC_LIBS="-L${libdir} -l$XMLSEC_CRYPTO_LIB $XMLSEC_CORE_LIBS $LIBXML_LIBS $LIBXSLT_LIBS $XMLSEC_CRYPTO_LIBS"
@@ -16897,6 +17967,7 @@ XMLSEC_LIBS="-L${libdir} -l$XMLSEC_CRYPTO_LIB $XMLSEC_CORE_LIBS $LIBXML_LIBS $LI
XMLSEC_CRYPTO_PC_FILES_LIST=""
for i in $XMLSEC_CRYPTO_LIST ; do
test x$i = xmscrypto && continue
+ test x$i = xmscng && continue
XMLSEC_CRYPTO_PC_FILES_LIST="$XMLSEC_CRYPTO_PC_FILES_LIST $XMLSEC_PACKAGE-$i.pc"
done
@@ -16926,6 +17997,11 @@ ac_config_files="$ac_config_files include/xmlsec/mscrypto/Makefile src/mscrypto/
fi
+if test "z$XMLSEC_NO_MSCNG" != "z1" ; then
+ac_config_files="$ac_config_files include/xmlsec/mscng/Makefile src/mscng/Makefile"
+
+fi
+
if test "z$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING" = "z1" ; then
(rm -f xmlsec1.pc && $LN_S xmlsec1-$XMLSEC_DEFAULT_CRYPTO.pc xmlsec1.pc)
else
@@ -17080,10 +18156,6 @@ if test -z "${HAS_HELP2MAN_TRUE}" && test -z "${HAS_HELP2MAN_FALSE}"; then
as_fn_error $? "conditional \"HAS_HELP2MAN\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${BUILD_MANPAGES_TRUE}" && test -z "${BUILD_MANPAGES_FALSE}"; then
- as_fn_error $? "conditional \"BUILD_MANPAGES\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${HAS_MAN2HTML_TRUE}" && test -z "${HAS_MAN2HTML_FALSE}"; then
as_fn_error $? "conditional \"HAS_MAN2HTML\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17092,6 +18164,22 @@ if test -z "${HAS_XSLTPROC_TRUE}" && test -z "${HAS_XSLTPROC_FALSE}"; then
as_fn_error $? "conditional \"HAS_XSLTPROC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${BUILD_MANPAGES_TRUE}" && test -z "${BUILD_MANPAGES_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_MANPAGES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_MANPAGES_TRUE}" && test -z "${BUILD_MANPAGES_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_MANPAGES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_MAN_DOCS_TRUE}" && test -z "${BUILD_MAN_DOCS_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_MAN_DOCS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_API_DOCS_TRUE}" && test -z "${BUILD_API_DOCS_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_API_DOCS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${BUILD_MAN_DOCS_TRUE}" && test -z "${BUILD_MAN_DOCS_FALSE}"; then
as_fn_error $? "conditional \"BUILD_MAN_DOCS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17120,6 +18208,10 @@ if test -z "${XMLSEC_NO_MSCRYPTO_TRUE}" && test -z "${XMLSEC_NO_MSCRYPTO_FALSE}"
as_fn_error $? "conditional \"XMLSEC_NO_MSCRYPTO\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${XMLSEC_NO_MSCNG_TRUE}" && test -z "${XMLSEC_NO_MSCNG_FALSE}"; then
+ as_fn_error $? "conditional \"XMLSEC_NO_MSCNG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${XMLSEC_NO_MD5_TRUE}" && test -z "${XMLSEC_NO_MD5_FALSE}"; then
as_fn_error $? "conditional \"XMLSEC_NO_MD5\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17605,7 +18697,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xmlsec1 $as_me 1.2.25, which was
+This file was extended by xmlsec1 $as_me 1.2.26, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17671,7 +18763,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xmlsec1 config.status 1.2.25
+xmlsec1 config.status 1.2.26
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -18096,6 +19188,8 @@ do
"src/nss/Makefile") CONFIG_FILES="$CONFIG_FILES src/nss/Makefile" ;;
"include/xmlsec/mscrypto/Makefile") CONFIG_FILES="$CONFIG_FILES include/xmlsec/mscrypto/Makefile" ;;
"src/mscrypto/Makefile") CONFIG_FILES="$CONFIG_FILES src/mscrypto/Makefile" ;;
+ "include/xmlsec/mscng/Makefile") CONFIG_FILES="$CONFIG_FILES include/xmlsec/mscng/Makefile" ;;
+ "src/mscng/Makefile") CONFIG_FILES="$CONFIG_FILES src/mscng/Makefile" ;;
"xmlsec1.pc") CONFIG_FILES="$CONFIG_FILES xmlsec1.pc:xmlsec.pc.in" ;;
"include/xmlsec/version.h") CONFIG_FILES="$CONFIG_FILES include/xmlsec/version.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
@@ -18817,7 +19911,6 @@ $as_echo X"$file" |
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
diff --git a/configure.ac b/configure.ac
index 3278200..951b3eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,16 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([xmlsec1],[1.2.25],[http://www.aleksey.com/xmlsec])
+AC_INIT([xmlsec1],[1.2.26],[http://www.aleksey.com/xmlsec])
XMLSEC_PACKAGE=xmlsec1
XMLSEC_VERSION_MAJOR=1
XMLSEC_VERSION_MINOR=2
-XMLSEC_VERSION_SUBMINOR=25
+XMLSEC_VERSION_SUBMINOR=26
XMLSEC_VERSION="$XMLSEC_VERSION_MAJOR.$XMLSEC_VERSION_MINOR.$XMLSEC_VERSION_SUBMINOR"
XMLSEC_VERSION_INFO=`echo $XMLSEC_VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
XMLSEC_VERSION_SAFE=`echo $XMLSEC_VERSION | sed 's/\./_/g'`
AC_PREREQ([2.52g])
+AC_LANG(C)
AC_CANONICAL_HOST
AC_SUBST(XMLSEC_VERSION)
@@ -43,7 +44,7 @@ LT_INIT
dnl
dnl Find programs
dnl
-if test "z$RM" == "z" ; then
+if test "z$RM" = "z" ; then
AC_PATH_PROG(RM, rm, /bin/rm)
fi
AC_PATH_PROG(CP, cp, /bin/cp)
@@ -51,6 +52,16 @@ AC_PATH_PROG(MV, mv, /bin/mv)
AC_PATH_PROG(TAR, tar, /bin/tar)
AC_PATH_PROG(PERL, perl)
+dnl Programs for man pahes and html docs
+AC_PATH_PROG(HELP2MAN, help2man)
+AC_PATH_PROG(XSLTPROC, xsltproc)
+AC_PATH_PROG(MAN2HTML, man2html)
+AC_PATH_PROG(GTKDOC_MKHTML, gtkdoc-mkhtml)
+AC_PATH_PROG(GTKDOC_MKDB, gtkdoc-mkdb)
+AC_PATH_PROG(GTKDOC_SCAN, gtkdoc-scan)
+AM_CONDITIONAL(HAS_HELP2MAN, [test x"$HELP2MAN" != x])
+AM_CONDITIONAL(HAS_MAN2HTML, [test x"$MAN2HTML" != x])
+AM_CONDITIONAL(HAS_XSLTPROC, [test x"$XSLTPROC" != x])
dnl Checks for header files.
AC_HEADER_DIRENT
@@ -67,14 +78,14 @@ AC_CHECK_FUNCS(strchr strrchr printf sprintf fprintf snprintf vfprintf vsprintf
XMLSEC_DEFINES=""
dnl ==========================================================================
-dnl Specific setup for Aleksey's development environment:
+dnl Specific setup for Aleksey's development environment:
dnl - with debug
dnl - with pedantic compiler flags
dnl - with docs build
dnl - with static binaries
dnl - without dynamic xmlsec-crypto loading
dnl ==========================================================================
-AC_MSG_CHECKING(for development environment)
+AC_MSG_CHECKING(for development environment)
AC_ARG_ENABLE(development, [ --enable-development enable development environment (no)])
if test "z$enable_development" = "zyes" ; then
enable_debugging="yes"
@@ -83,51 +94,39 @@ if test "z$enable_development" = "zyes" ; then
enable_manpages_build="yes"
enable_docs_build="yes"
enable_crypto_dl="no"
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
fi
dnl ==========================================================================
dnl Do we want to build manpages?
dnl ==========================================================================
-AC_MSG_CHECKING(for man pages build)
+AC_MSG_CHECKING(for man pages build)
AC_ARG_ENABLE(manpages_build,[ --enable-manpages-build man pages build (no)])
if test "z$enable_manpages_build" = "zyes" ; then
- AC_PATH_PROG(HELP2MAN, help2man)
-
- AC_MSG_RESULT(yes)
+ AM_CONDITIONAL(BUILD_MANPAGES, [test x"$HELP2MAN" != x])
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT(no)
+ AM_CONDITIONAL(BUILD_MANPAGES, [test "x" = "y"])
+ AC_MSG_RESULT([disabled])
fi
-AM_CONDITIONAL(HAS_HELP2MAN, [test x"$HELP2MAN" != x])
-AM_CONDITIONAL(BUILD_MANPAGES, [test x"$HELP2MAN" != x])
-
dnl ==========================================================================
dnl Do we want to build docs?
dnl ==========================================================================
-AC_MSG_CHECKING(for docs build)
+AC_MSG_CHECKING(for docs build)
AC_ARG_ENABLE(docs_build, [ --enable-docs-build docs build (no)])
if test "z$enable_docs_build" = "zyes" ; then
- AC_PATH_PROG(XSLTPROC, xsltproc)
- AC_PATH_PROG(MAN2HTML, man2html)
- AC_PATH_PROG(GTKDOC_MKHTML, gtkdoc-mkhtml)
- AC_PATH_PROG(GTKDOC_MKTMPL, gtkdoc-mktmpl)
- AC_PATH_PROG(GTKDOC_MKDB, gtkdoc-mkdb)
- AC_PATH_PROG(GTKDOC_SCAN, gtkdoc-scan)
-
- AC_MSG_RESULT(yes)
+ AM_CONDITIONAL(BUILD_MAN_DOCS, [test x"$PERL" != x && test x"$XSLTPROC" != x && test x"$MAN2HTML" != x])
+ AM_CONDITIONAL(BUILD_API_DOCS, [test x"$PERL" != x && test x"$XSLTPROC" != x && test x"$GTKDOC_MKHTML" != x && test x"$GTKDOC_MKDB" != x && test x"$GTKDOC_SCAN" != x])
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT(no)
+ AM_CONDITIONAL(BUILD_MAN_DOCS, [test "x" = "y"])
+ AM_CONDITIONAL(BUILD_API_DOCS, [test "x" = "y"])
+ AC_MSG_RESULT([disabled])
fi
-AM_CONDITIONAL(HAS_MAN2HTML, [test x"$MAN2HTML" != x])
-AM_CONDITIONAL(HAS_XSLTPROC, [test x"$XSLTPROC" != x])
-
-AM_CONDITIONAL(BUILD_MAN_DOCS, [test x"$PERL" != x && test x"$XSLTPROC" != x && test x"$MAN2HTML" != x])
-AM_CONDITIONAL(BUILD_API_DOCS, [test x"$PERL" != x && test x"$XSLTPROC" != x && test x"$GTKDOC_MKHTML" != x && test x"$GTKDOC_MKTMPL" != x && test x"$GTKDOC_MKDB" != x && test x"$GTKDOC_SCAN" != x])
-
dnl ==========================================================================
dnl Perform host specific configuration
dnl ==========================================================================
@@ -135,7 +134,6 @@ XMLSEC_EXTRA_LDFLAGS=
XMLSEC_CRYPTO_EXTRA_LDFLAGS=
dnl should separate extra LDFLAGS for xmlsec and crypto libs ?
dnl should --enable-runtime-pseudo-reloc for mingw and cygwin ?
-
if test -n "$shrext"; then
XMLSEC_SHLIBSFX="$shrext"
else
@@ -159,14 +157,14 @@ case "${host}" in
XMLSEC_CRYPTO_EXTRA_LDFLAGS="-no-undefined"
;;
*-*-darwin*)
- XMLSEC_SHLIBSFX=".dylib"
- ;;
+ XMLSEC_SHLIBSFX=".dylib"
+ ;;
esac
dnl ==========================================================================
dnl Hack for autoconf version mismatch
dnl ==========================================================================
-if test "z$shrext" == "z" ; then
+if test "z$shrext" = "z" ; then
shrext=$shrext_cmds
fi
@@ -182,19 +180,19 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
[[char *foo = __func__;]])],
[ac_func_exists=yes],
[ac_func_exists=no])
-if test "z$ac_func_exists" = "zyes" ; then
- AC_MSG_RESULT(__func__)
+if test "z$ac_func_exists" = "zyes" ; then
+ AC_MSG_RESULT([__func__])
XMLSEC_DEFINES="$XMLSEC_DEFINES -D__XMLSEC_FUNCTION__=__func__"
elif test "z$ac_function_exists" = "zyes" ; then
- AC_MSG_RESULT(__FUNCTION__)
+ AC_MSG_RESULT([__FUNCTION__])
XMLSEC_DEFINES="$XMLSEC_DEFINES -D__XMLSEC_FUNCTION__=__FUNCTION__"
-else
+else
AC_MSG_RESULT("no")
fi
dnl ==========================================================================
-dnl check do we have size_t and its size,
-dnl TODO: will need to replace this and the xmlSecSize define with
+dnl check do we have size_t and its size,
+dnl TODO: will need to replace this and the xmlSecSize define with
dnl typedef on next ABI refresh
dnl ==========================================================================
AC_CHECK_SIZEOF(size_t)
@@ -203,10 +201,11 @@ if test "$ac_cv_sizeof_size_t" -ne "4" ; then
fi
dnl ==========================================================================
-dnl Check if pkg-config enabled and installed
+dnl Check if pkg-config is enabled and installed
dnl ==========================================================================
PKGCONFIG_FOUND="no"
-AC_ARG_ENABLE(pkgconfig, [ --enable-pkgconfig enable pkgconfig for configuration (yes)])
+AC_ARG_ENABLE(pkgconfig,
+ [ --enable-pkgconfig enable pkgconfig for configuration (yes)])
if test "z$enable_pkgconfig" != "zno" ; then
PKG_PROG_PKG_CONFIG
PKGCONFIG_FOUND="yes"
@@ -215,78 +214,222 @@ else
fi
dnl ==========================================================================
+dnl Check if packages custom config scripts are enabled
+dnl ==========================================================================
+ENABLE_CUSTOM_CONFIGS="no"
+AC_ARG_ENABLE(custom-configs,
+ [ --enable-custom-configs enable package-specific custom scripts for configuration (yes)])
+if test "z$enable_custom_configs" != "zno" ; then
+ ENABLE_CUSTOM_CONFIGS="yes"
+else
+ ENABLE_CUSTOM_CONFIGS="no"
+fi
+
+dnl ==========================================================================
+dnl Check searching for typical packages folders is enabled
+dnl ==========================================================================
+ENABLE_FOLDERS_SEARCH="no"
+AC_ARG_ENABLE(folders-search,
+ [ --enable-folders-search enable searching for package installation in typical folders (yes)])
+if test "z$enable_folders_search" != "zno" ; then
+ ENABLE_FOLDERS_SEARCH="yes"
+else
+ ENABLE_FOLDERS_SEARCH="no"
+fi
+
+dnl ==========================================================================
+dnl Common installation locations
+dnl ==========================================================================
+COMMON_INCLUDE_DIR="/usr/include /usr/local/include"
+COMMON_LIB_DIR="/usr/lib /usr/lib64 /usr/local/lib"
+case $host in
+ i*86-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/i386-linux-gnu" ;;
+ x86_64-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/x86_64-linux-gnu" ;;
+ *) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/$host" ;;
+esac
+
+dnl Macro to help find the folder that contains marker file.
+dnl Usage: AX_FIND_FOLDER(RESULT_VARIABLE, MARKER_FILE, FOLDERS_LIST)
+AC_DEFUN([AX_FIND_FOLDER],[
+ for dir in $3 ; do
+ if test -f "$dir/$2" ; then
+ $1="$dir"
+ break;
+ fi
+ done
+])
+
+dnl ==========================================================================
dnl find libxml
dnl ==========================================================================
LIBXML_MIN_VERSION="2.8.0"
+LIBXML_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/include/libxml2 /usr/local/include/libxml2 /usr/local/libxml2/include"
+LIBXML_LIB_DIR="$COMMON_LIB_DIR /usr/local/libxml2/lib"
+LIBXML_INCLUDE_MARKER="libxml/xmlversion.h"
+LIBXML_LIB_MARKER="libxml2$shrext"
+LIBXML_LIBS_LIST="-lxml2"
LIBXML_CONFIG="xml2-config"
+
+LIBXML_INCLUDE_PATH=
+LIBXML_LIB_PATH=
+LIBXML_CONFIG_PATH=
LIBXML_FOUND="no"
-AC_ARG_WITH(libxml,
+AC_ARG_WITH(libxml,
[ --with-libxml=[PFX] libxml2 location]
)
-AC_ARG_WITH(libxml-src,
- [ --with-libxml-src=[PFX] not installed yet libxml2 location]
+AC_ARG_WITH(libxml-src,
+ [ --with-libxml-src=[PFX] libxml2 source tree location]
)
-if test "z$LIBXML_CFLAGS" = "z" -o "z$LIBXML_LIBS" = "z"; then
- if test "z$with_libxml" = "zno" -o "z$with_libxml_src" = "zno"; then
- AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_MIN_VERSION)
- AC_MSG_ERROR(libxml2 >= $LIBXML_MIN_VERSION is required for $XMLSEC_PACKAGE)
- elif test "z$with_libxml_src" != "z" ; then
- AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_MIN_VERSION)
- CWD=`pwd`
- if cd "$with_libxml_src" ; then
- SRC_DIR=`pwd`
- LIBXML_CONFIG=${SRC_DIR}/xml2-config
- LIBXML_LIBS="-L${SRC_DIR}/.libs -lxml2"
- LIBXML_CFLAGS="-I${SRC_DIR}/include"
- LIBXML_FOUND="yes"
- cd $CWD
- AC_MSG_RESULT([yes (source)])
- else
- AC_MSG_ERROR([libxml source dir not found (${with_libxml_src}), typo?])
- fi
- elif test "z$with_libxml" = "z" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
- PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_MIN_VERSION,
- [LIBXML_FOUND=yes],
- [LIBXML_FOUND=no])
- fi
- if test "z$LIBXML_FOUND" = "zno" ; then
- if test "z$with_libxml" != "zyes" ; then
- if test "z$with_libxml" != "z" ; then
- AC_PATH_PROG([LIBXML_CONFIG], [$LIBXML_CONFIG], [],
- [$with_libxml/bin:$PATH])
- else
- AC_PATH_PROG([LIBXML_CONFIG], [$LIBXML_CONFIG], [],
- [$PATH])
- fi
+dnl Priority 0: LibXML2 is disabled: hard error.
+if test "z$with_libxml" = "zno" -o "z$with_libxml_src" = "zno"; then
+ LIBXML_FOUND="disabled"
+fi
+
+dnl Priority 1: User specifies the path to source code
+if test "z$LIBXML_FOUND" = "zno" -a "z$with_libxml_src" != "z" -a "z$with_libxml_src" != "zyes" ; then
+ AC_MSG_CHECKING(for libxml2 library source tree in "$with_libxml_src" folder)
+ if test -f "$with_libxml_src/include/$LIBXML_INCLUDE_MARKER" -a -f "$with_libxml_src/.libs/$LIBXML_LIB_MARKER" ; then
+ LIBXML_INCLUDE_PATH="$with_libxml_src/include"
+ LIBXML_LIB_PATH="$with_libxml_src/.libs"
+ LIBXML_FOUND="yes"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_ERROR([not found: "$with_libxml_src/include/$LIBXML_INCLUDE_MARKER" or "$with_libxml_src/.libs/$LIBXML_LIB_MARKER" files don't exist), typo?])
+ fi
+fi
+
+dnl Priority 2: User specifies path to installation
+if test "z$LIBXML_FOUND" = "zno" -a "z$with_libxml" != "z" -a "z$with_libxml" != "zyes" ; then
+ AC_MSG_CHECKING(for libxml2 library installation in "$with_libxml" folder)
+ if test "z$ENABLE_CUSTOM_CONFIGS" = "zyes" -a -f "$with_libxml/bin/$LIBXML_CONFIG" ; then
+ LIBXML_CONFIG_PATH="$with_libxml/bin/$LIBXML_CONFIG"
+ LIBXML_FOUND="yes"
+ AC_MSG_RESULT([yes])
+ elif test -f "$with_libxml/include/libxml2/$LIBXML_INCLUDE_MARKER" -a -f "$with_libxml/lib/$LIBXML_LIB_MARKER" ; then
+ LIBXML_INCLUDE_PATH="$with_libxml/include/libxml2"
+ LIBXSLT_LIB_PATH="$with_libxml/lib"
+ LIBXML_FOUND="yes"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_ERROR([not found: "$with_libxml/bin/$LIBXML_CONFIG" tool, or "$with_libxml/include/libxml2/$LIBXML_INCLUDE_MARKER" and/or "$with_libxml/lib/$LIBXML_LIB_MARKER" files don't exist), typo?])
+ fi
+fi
+
+dnl Priority 3: User sets both CFLAGS and LIBS flags
+if test "z$LIBXML_FOUND" = "zno" -a "z$LIBXML_CFLAGS" != "z" -a "z$LIBXML_LIBS" != "z" ; then
+ LIBXML_FOUND="yes"
+fi
+
+dnl Priority 4: Guess with pkg_config
+if test "z$LIBXML_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
+ PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_MIN_VERSION,
+ [LIBXML_FOUND=yes],
+ [LIBXML_FOUND=no])
+fi
+
+dnl Priority 5: Guess the config tool location
+if test "z$LIBXML_FOUND" = "zno" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then
+ AC_PATH_PROG(LIBXML_CONFIG_PATH, [$LIBXML_CONFIG], [], [$PATH])
+ if test "z$LIBXML_CONFIG_PATH" != "z" ; then
+ LIBXML_FOUND="yes"
+ fi
+fi
+
+dnl Priority 6: Guess using a list of folders.
+if test "z$LIBXML_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then
+ AC_MSG_CHECKING(for libxml2 library installation in the typical folders)
+ if test "z$LIBXML_INCLUDE_PATH" = "z" ; then
+ AX_FIND_FOLDER(LIBXML_INCLUDE_PATH, $LIBXML_INCLUDE_MARKER, $LIBXML_INCLUDE_DIR)
+ fi
+ if test "z$LIBXML_LIB_PATH" = "z" ; then
+ AX_FIND_FOLDER(LIBXML_LIB_PATH, $LIBXML_LIB_MARKER, $LIBXML_LIB_DIR)
+ fi
+ if test "z$LIBXML_INCLUDE_PATH" != "z" -a "z$LIBXML_LIB_PATH" != "z" ; then
+ LIBXML_FOUND="yes"
+ AC_MSG_RESULT([yes ("-I$LIBXML_INCLUDE_PATH -L$LIBXML_LIB_PATH")])
+ else
+ AC_MSG_RESULT([not found])
+ fi
+fi
+
+dnl Priority 7: Just try to compile/link and hope for the best
+if test "z$LIBXML_FOUND" = "zno" ; then
+ AC_MSG_CHECKING(for libxml2 library installation)
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $LIBXML_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $LIBXML_LIBS $LIBXML_LIBS_LIST"
+ AC_LINK_IFELSE([
+ AC_LANG_PROGRAM([[
+ #include <libxml/xmlversion.h>
+ ]],[[
+ int main () { xmlCheckVersion(0);; return(0); }
+ ]])
+ ],[
+ LIBXML_FOUND=yes
+ LIBXML_LIBS="$LIBXML_LIBS $LIBXML_LIBS_LIST"
+ AC_MSG_RESULT([yes])
+ ],[
+ LIBXML_FOUND=no
+ AC_MSG_RESULT([not found])
+ ])
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
+fi
+
+dnl Set CFLAGS/LIBS flags
+if test "z$LIBXML_FOUND" = "zyes" ; then
+ if test "z$LIBXML_CONFIG_PATH" != "z" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then
+ dnl Get the values using config tool (overwrite CFLAGS/LIBS!)
+ if test "z$LIBXML_CFLAGS" = "z" ; then
+ LIBXML_CFLAGS="`$LIBXML_CONFIG_PATH --cflags`"
fi
- AC_MSG_CHECKING([libxml2 $LIBXML_CONFIG ])
- if ! LIBXML_VERSION=`$LIBXML_CONFIG --version 2>/dev/null`; then
- AC_MSG_ERROR(Could not find libxml2 anywhere.)
+ if test "z$LIBXML_LIBS" = "z"; then
+ LIBXML_LIBS="`$LIBXML_CONFIG_PATH --libs`"
fi
- vers=`echo $LIBXML_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- minvers=`echo $LIBXML_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- if test "$vers" -ge "$minvers" ; then
- LIBXML_LIBS="`$LIBXML_CONFIG --libs`"
- LIBXML_CFLAGS="`$LIBXML_CONFIG --cflags`"
- LIBXML_FOUND="yes"
- AC_MSG_RESULT([yes ('$LIBXML_VERSION')])
- else
- AC_MSG_ERROR(You need at least libxml2 $LIBXML_MIN_VERSION for this version of $XMLSEC_PACKAGE)
+ LIBXML_CONFIG=$LIBXML_CONFIG_PATH
+ LIBXML_FOUND="yes"
+ else
+ dnl Set flags if INCLUDE_PATH or LIB_PATH are set (do NOT overwrite CFLAGS/LIBS!)
+ if test "z$LIBXML_INCLUDE_PATH" != "z" ; then
+ LIBXML_CFLAGS="$LIBXML_CFLAGS -I$LIBXML_INCLUDE_PATH"
+ fi
+ if test "z$LIBXML_LIB_PATH" != "z" ; then
+ if test "z$with_gnu_ld" = "zyes" ; then
+ LIBXML_LIBS="$LIBXML_LIBS -Wl,-rpath-link -Wl,$LIBXML_LIB_PATH"
+ fi
+ LIBXML_LIBS="$LIBXML_LIBS -L$LIBXML_LIB_PATH $LIBXML_LIBS_LIST"
fi
fi
-else
- AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_MIN_VERSION)
+fi
+
+dnl Verify the version.
+AC_MSG_CHECKING(for libxml2 library >= $LIBXML_MIN_VERSION)
+if test "z$LIBXML_FOUND" = "zyes" ; then
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $LIBXML_CFLAGS"
minvers=`echo $LIBXML_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 100 + $2) * 100 + $3;}'`
- __save_CFLAGS="${CFLAGS}"
- CFLAGS="${CFLAGS} ${LIBXML_CFLAGS}"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <libxml/xmlversion.h>
-#if LIBXML_VERSION < $minvers
-#error "libxml2 is too old"
-#endif]])],AC_MSG_RESULT([OK]),AC_MSG_ERROR([You need at least libxml2 $LIBXML_MIN_VERSION for this version of $XMLSEC_PACKAGE]))
- CFLAGS="${__save_CFLAGS}"
+ AC_EGREP_CPP(greater-than-minvers, [
+ #include <libxml/xmlversion.h>
+ #if LIBXML_VERSION >= $minvers
+ greater-than-minvers
+ #endif
+ ],[
+ LIBXML_FOUND=yes
+ ],[
+ LIBXML_FOUND=no
+ ])
+ CPPFLAGS=$OLD_CPPFLAGS
fi
+AC_MSG_RESULT([$LIBXML_FOUND])
+dnl LibXML2 is required so if we didn't find it then it is a fatal error.
+if test "z$LIBXML_FOUND" != "zyes" ; then
+ AC_MSG_ERROR([libxml2 library >= $LIBXML_MIN_VERSION is required for this version of $XMLSEC_PACKAGE])
+fi
+
+dnl Finally set variables
AC_SUBST(LIBXML_CFLAGS)
AC_SUBST(LIBXML_LIBS)
AC_SUBST(LIBXML_CONFIG)
@@ -295,82 +438,178 @@ AC_SUBST(LIBXML_MIN_VERSION)
dnl ==========================================================================
dnl find libxslt
dnl ==========================================================================
-XMLSEC_NO_LIBXSLT="1"
LIBXSLT_MIN_VERSION=1.0.20
-LIBXSLT_PC_FILE_COND="libxslt >= $LIBXSLT_MIN_VERSION"
+LIBXSLT_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/local/libxslt/include"
+LIBXSLT_LIB_DIR="$COMMON_LIB_DIR /usr/local/libxslt/lib"
LIBXSLT_CONFIG="xslt-config"
-LIBXSLT_CFLAGS=""
-LIBXSLT_LIBS=""
+LIBXSLT_INCLUDE_MARKER="libxslt/xsltconfig.h"
+LIBXSLT_LIB_MARKER="libxslt$shrext"
+LIBXSLT_LIBS_LIST="-lxslt"
+
+XMLSEC_NO_LIBXSLT="1"
+LIBXSLT_INCLUDE_PATH=
+LIBXSLT_LIB_PATH=
+LIBXSLT_CONFIG_PATH=
LIBXSLT_FOUND="no"
-AC_ARG_WITH(libxslt,
+AC_ARG_WITH(libxslt,
[ --with-libxslt=[PFX] libxslt location]
)
-AC_ARG_WITH(libxslt-src,
- [ --with-libxslt-src=[PFX] not installed yet libxslt location]
+AC_ARG_WITH(libxslt-src,
+ [ --with-libxslt-src=[PFX] libxslt source tree location]
)
+
+dnl Priority 0: Check if library is not needed
if test "z$with_libxslt" = "zno" -o "z$with_libxslt_src" = "zno" ; then
- AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION)
- AC_MSG_RESULT(no)
- LIBXSLT_FOUND="without"
-elif test "z$with_libxslt_src" != "z" ; then
- AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION)
- CWD=`pwd`
- if cd "$with_libxslt_src" ; then
- SRC_DIR=`pwd`
- LIBXSLT_CONFIG=${SRC_DIR}/xslt-config
- LIBXSLT_LIBS="-L${SRC_DIR}/libxslt/.libs -lxslt"
- LIBXSLT_CFLAGS="-I${SRC_DIR}"
- LIBXSLT_FOUND="yes"
- cd $CWD
- AC_MSG_RESULT([yes (source)])
- else
- AC_MSG_ERROR([libxslt source dir not found (${with_libxslt_src}), typo?])
- fi
-elif test "z$with_libxslt" = "z" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
+ LIBXSLT_FOUND="disabled"
+fi
+
+dnl Priority 1: User specifies the path to source code
+if test "z$LIBXSLT_FOUND" = "zno" -a "z$with_libxslt_src" != "z" -a "z$with_libxslt_src" != "zyes" ; then
+ AC_MSG_CHECKING(for libxslt library source tree in "$with_libxslt_src" folder)
+ if test -f "$with_libxslt_src/$LIBXSLT_INCLUDE_MARKER" -a -f "$with_libxslt_src/libxslt/.libs/$LIBXSLT_LIB_MARKER" ; then
+ LIBXSLT_INCLUDE_PATH="$with_libxslt_src"
+ LIBXSLT_LIB_PATH="$with_libxslt_src/libxslt/.libs"
+ LIBXSLT_FOUND="yes"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_ERROR([not found: "$with_libxslt_src/$LIBXSLT_INCLUDE_MARKER" and/or "$with_libxslt_src/libxslt/.libs/$LIBXSLT_LIB_MARKER" files don't exist), typo?])
+ fi
+fi
+
+dnl Priority 2: User specifies path to installation
+if test "z$LIBXSLT_FOUND" = "zno" -a "z$with_libxslt" != "z" -a "z$with_libxslt" != "zyes" ; then
+ AC_MSG_CHECKING(for libxslt library installation in "$with_libxslt" folder)
+ if test "z$ENABLE_CUSTOM_CONFIGS" = "zyes" -a -f "$with_libxslt/bin/$LIBXSLT_CONFIG" ; then
+ LIBXSLT_CONFIG_PATH="$with_libxslt/bin/$LIBXSLT_CONFIG"
+ LIBXSLT_FOUND="yes"
+ AC_MSG_RESULT([yes])
+ elif test -f "$with_libxslt/include/$LIBXSLT_INCLUDE_MARKER" -a -f "$with_libxslt/lib/$LIBXSLT_LIB_MARKER" ; then
+ LIBXSLT_INCLUDE_PATH="$with_libxslt/include"
+ LIBXSLT_LIB_PATH="$with_libxslt/lib"
+ LIBXSLT_FOUND="yes"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_ERROR([not found: "$with_libxslt/bin/$LIBXSLT_CONFIG" tool, or "$with_libxslt/include/$LIBXSLT_INCLUDE_MARKER" and/or "$with_libxslt/lib/$LIBXSLT_LIB_MARKER" files don't exist), typo?])
+ fi
+fi
+
+dnl Priority 3: User sets both CFLAGS and LIBS flags
+if test "z$LIBXSLT_FOUND" = "zno" -a "z$LIBXSLT_CFLAGS" != "z" -a "z$LIBXSLT_LIBS" != "z" ; then
+ LIBXSLT_FOUND="yes"
+fi
+
+dnl Priority 4: Guess with pkg_config
+if test "z$LIBXSLT_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
PKG_CHECK_MODULES(LIBXSLT, libxslt >= $LIBXSLT_MIN_VERSION,
- [LIBXSLT_FOUND=yes],
- [LIBXSLT_FOUND=no])
+ [LIBXSLT_FOUND=yes],
+ [LIBXSLT_FOUND=no])
+fi
+
+dnl Priority 5: Guess the config tool location
+if test "z$LIBXSLT_FOUND" = "zno" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then
+ AC_PATH_PROG(LIBXSLT_CONFIG_PATH, [$LIBXSLT_CONFIG], [], [$PATH])
+ if test "z$LIBXSLT_CONFIG_PATH" != "z" ; then
+ LIBXSLT_FOUND="yes"
+ fi
fi
+dnl Priority 6: Guess using a list of folders.
+if test "z$LIBXSLT_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then
+ AC_MSG_CHECKING(for libxslt library installation in the typical folders)
+ if test "z$LIBXSLT_INCLUDE_PATH" = "z" ; then
+ AX_FIND_FOLDER(LIBXSLT_INCLUDE_PATH, $LIBXSLT_INCLUDE_MARKER, $LIBXSLT_INCLUDE_DIR)
+ fi
+ if test "z$LIBXSLT_LIB_PATH" = "z" ; then
+ AX_FIND_FOLDER(LIBXSLT_LIB_PATH, $LIBXSLT_LIB_MARKER, $LIBXSLT_LIB_DIR)
+ fi
+ if test "z$LIBXSLT_INCLUDE_PATH" != "z" -a "z$LIBXSLT_LIB_PATH" != "z" ; then
+ LIBXSLT_FOUND="yes"
+ AC_MSG_RESULT([yes ("-I$LIBXSLT_INCLUDE_PATH -L$LIBXSLT_LIB_PATH")])
+ else
+ AC_MSG_RESULT([not found])
+ fi
+fi
+
+dnl Priority 7: Just try to compile/link and hope for the best
if test "z$LIBXSLT_FOUND" = "zno" ; then
- if test "z$with_libxslt" != "zyes" ; then
- if test "z$with_libxslt" != "z" ; then
- AC_PATH_PROG([LIBXSLT_CONFIG], [$LIBXSLT_CONFIG], [],
- [$with_libxslt/bin:$PATH])
- else
- AC_PATH_PROG([LIBXSLT_CONFIG], [$LIBXSLT_CONFIG], [],
- [$PATH])
+ AC_MSG_CHECKING(for libxslt library installation)
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $LIBXML_CFLAGS $LIBXSLT_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $LIBXML_LIBS $LIBXSLT_LIBS $LIBXSLT_LIBS_LIST"
+ AC_LINK_IFELSE([
+ AC_LANG_PROGRAM([[
+ #include <libxslt/xslt.h>
+ ]],[[
+ int main () { xsltInit(); return(0); }
+ ]])
+ ],[
+ LIBXSLT_FOUND=yes
+ LIBXSLT_LIBS="$LIBXSLT_LIBS $LIBXSLT_LIBS_LIST"
+ AC_MSG_RESULT([yes])
+ ],[
+ LIBXSLT_FOUND=no
+ AC_MSG_RESULT([not found])
+ ])
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
+fi
+
+dnl Set CFLAGS/LIBS flags
+if test "z$LIBXSLT_FOUND" = "zyes" ; then
+ if test "z$LIBXSLT_CONFIG_PATH" != "z" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then
+ dnl Get the values using config tool (overwrite CFLAGS/LIBS!)
+ if test "z$LIBXSLT_CFLAGS" = "z" ; then
+ LIBXSLT_CFLAGS="`$LIBXSLT_CONFIG_PATH --cflags`"
fi
- fi
- AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION)
- if ! LIBXSLT_VERSION=`$LIBXSLT_CONFIG --version 2>/dev/null`; then
- if test "z$with_libxslt" != "zyes" ; then
- AC_MSG_ERROR(Unable to find libxslt at '$with_libxslt')
- else
- AC_MSG_RESULT(no)
- fi
+ if test "z$LIBXSLT_LIBS" = "z"; then
+ LIBXSLT_LIBS="`$LIBXSLT_CONFIG_PATH --libs`"
+ fi
+ LIBXSLT_CONFIG=$LIBXSLT_CONFIG_PATH
+ LIBXSLT_FOUND="yes"
else
- vers=`echo $LIBXSLT_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- minvers=`echo $LIBXSLT_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- if test "$vers" -ge "$minvers" ; then
- LIBXSLT_LIBS="`$LIBXSLT_CONFIG --libs`"
- LIBXSLT_CFLAGS="`$LIBXSLT_CONFIG --cflags`"
- LIBXSLT_FOUND="yes"
- AC_MSG_RESULT([yes ('$LIBXSLT_VERSION')])
- else
- AC_MSG_ERROR(You need at least libxslt $LIBXSLT_MIN_VERSION for this version of $XMLSEC_PACKAGE)
- fi
+ dnl Set flags if INCLUDE_PATH or LIB_PATH are set (do NOT overwrite CFLAGS/LIBS!)
+ if test "z$LIBXSLT_INCLUDE_PATH" != "z" ; then
+ LIBXSLT_CFLAGS="$LIBXSLT_CFLAGS -I$LIBXSLT_INCLUDE_PATH"
+ fi
+ if test "z$LIBXSLT_LIB_PATH" != "z" ; then
+ if test "z$with_gnu_ld" = "zyes" ; then
+ LIBXSLT_LIBS="$LIBXSLT_LIBS -Wl,-rpath-link -Wl,$LIBXSLT_LIB_PATH"
+ fi
+ LIBXSLT_LIBS="$LIBXSLT_LIBS -L$LIBXSLT_LIB_PATH $LIBXSLT_LIBS_LIST"
+ fi
fi
fi
+dnl Verify the version
+AC_MSG_CHECKING(for libxslt library >= $LIBXSLT_MIN_VERSION)
+if test "z$LIBXSLT_FOUND" = "zyes" ; then
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $LIBXSLT_CFLAGS"
+ minvers=`echo $LIBXSLT_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 100 + $2) * 100 + $3;}'`
+ AC_EGREP_CPP(greater-than-minvers, [
+ #include <libxslt/xsltconfig.h>
+ #if LIBXSLT_VERSION >= $minvers
+ greater-than-minvers
+ #endif
+ ],[
+ LIBXSLT_FOUND=yes
+ ],[
+ LIBXSLT_FOUND=no
+ ])
+ CPPFLAGS=$OLD_CPPFLAGS
+fi
+AC_MSG_RESULT([$LIBXSLT_FOUND])
+
+dnl Finally set variables
if test "z$LIBXSLT_FOUND" = "zyes" ; then
XMLSEC_NO_LIBXSLT="0"
+ LIBXSLT_PC_FILE_COND="libxslt >= $LIBXSLT_MIN_VERSION"
else
+ XMLSEC_NO_LIBXSLT="1"
LIBXSLT_PC_FILE_COND=""
- LIBXSLT_MIN_VERSION=""
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XSLT=1"
fi
-
AC_SUBST(XMLSEC_NO_LIBXSLT)
AC_SUBST(LIBXSLT_CFLAGS)
AC_SUBST(LIBXSLT_LIBS)
@@ -387,153 +626,206 @@ XMLSEC_CRYPTO_DISABLED_LIST=""
dnl ==========================================================================
dnl OpenSSL
dnl ==========================================================================
-ac_openssl_lib_dir="/usr/local/lib /usr/lib /usr/lib64 /usr/local /usr/local/ssl /usr/local/ssl/lib /usr/pkg"
-ac_openssl_inc_dir="/usr/local/include /usr/include /usr/local /usr/local/ssl /usr/pkg /usr/local/ssl/include"
+OPENSSL_MIN_VERSION="1.0.0"
+OPENSSL_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/local/ssl/include"
+OPENSSL_LIB_DIR="$COMMON_LIB_DIR /usr/local/ssl/lib"
+OPENSSL_CRYPTO_LIB="$XMLSEC_PACKAGE-openssl"
+OPENSSL_INCLUDE_MARKER="openssl/opensslv.h"
+OPENSSL_LIB_SHARED_MARKER="libcrypto$shrext"
+OPENSSL_LIB_STATIC_MARKER="libcrypto.a"
+OPENSSL_LIBS_LIST="-lcrypto"
+case $host in
+ *-*-mingw*) OPENSSL_EXTRA_LIBS=;;
+ *-*-osf5*) OPENSSL_EXTRA_LIBS=;;
+ *-*-openbsd*) OPENSSL_EXTRA_LIBS=;;
+ *-*-netbsd*) OPENSSL_EXTRA_LIBS=;;
+ #FIXME: check if lib "dl" is required
+ *) OPENSSL_EXTRA_LIBS=-ldl;;
+esac
XMLSEC_NO_OPENSSL="1"
-OPENSSL_MIN_VERSION="1.0.0"
OPENSSL_VERSION=""
-OPENSSL_CFLAGS=""
-OPENSSL_LIBS=""
-OPENSSL_CRYPTO_LIB="$XMLSEC_PACKAGE-openssl"
+OPENSSL_INCLUDE_PATH=
+OPENSSL_LIB_PATH=
OPENSSL_FOUND=no
-AC_ARG_WITH(openssl, [ --with-openssl=[PFX] openssl location])
+AC_ARG_WITH(openssl,
+ [ --with-openssl[=PFX] openssl location])
+
+dnl Priority 0: Check if library is disabled
if test "z$with_openssl" = "zno" ; then
- OPENSSL_FOUND=without
- AC_MSG_CHECKING(for openssl libraries >= $OPENSSL_MIN_VERSION)
- AC_MSG_RESULT(no)
-elif test "z$with_openssl" != "z" ; then
- case $host in
- *-*-mingw*) openssl_exlibs=;;
- *-*-osf5*) openssl_exlibs=;;
- *-*-openbsd*) openssl_exlibs=;;
- *-*-netbsd*) openssl_exlibs=;;
- #FIXME: check if lib "dl" is required
- *) openssl_exlibs=-ldl;;
- esac
- OPENSSL_CFLAGS="$OPENSSL_CFLAGS -I$with_openssl/include"
- if test -f "$with_openssl/lib/libcrypto${XMLSEC_SHLIBSFX}" ; then
- OPENSSL_LIBS="-L$with_openssl/lib -lcrypto $openssl_exlibs"
+ OPENSSL_FOUND=disabled
+fi
+
+dnl Priority 1: User specifies the path to installation
+if test "z$OPENSSL_FOUND" = "zno" -a "z$with_openssl" != "z" -a "z$with_openssl" != "zyes" ; then
+ AC_MSG_CHECKING(for openssl library installation in "$with_openssl" folder)
+ if test -f "$with_openssl/include/$OPENSSL_INCLUDE_MARKER" -a -f "$with_openssl/lib/$OPENSSL_LIB_SHARED_MARKER" ; then
+ OPENSSL_INCLUDE_PATH="$with_openssl/include"
+ OPENSSL_LIB_PATH="$with_openssl/lib"
+ OPENSSL_FOUND="yes"
+ AC_MSG_RESULT([yes])
+ elif test -f "$with_openssl/include/$OPENSSL_INCLUDE_MARKER" -a -f "$with_openssl/lib/$OPENSSL_LIB_STATIC_MARKER" ; then
+ OPENSSL_INCLUDE_PATH="$with_openssl/include"
+ OPENSSL_LIB_PATH="$with_openssl/lib"
+ OPENSSL_FOUND="yes"
+ AC_MSG_RESULT([yes])
else
- OPENSSL_LIBS="$with_openssl/lib/libcrypto.a $openssl_exlibs"
+ AC_MSG_ERROR([not found: "$with_openssl/include/$OPENSSL_INCLUDE_MARKER" or "$with_openssl/lib/$OPENSSL_LIB_SHARED_MARKER" or "$with_openssl/lib/$OPENSSL_LIB_STATIC_MARKER" files don't exist), typo?])
fi
+fi
+
+dnl Priority 2: User sets both CFLAGS and LIBS flags
+if test "z$OPENSSL_FOUND" = "zno" -a "z$OPENSSL_CFLAGS" != "z" -a "z$OPENSSL_LIBS" != "z" ; then
OPENSSL_FOUND="yes"
-elif test "z$PKGCONFIG_FOUND" = "zyes" ; then
- if test "z$OPENSSL_VERSION" = "z" ; then
- PKG_CHECK_MODULES(OPENSSL, openssl >= 1.1.0,
- [OPENSSL_VERSION="1.1.0"],
- [OPENSSL_VERSION=""])
- fi
+fi
- if test "z$OPENSSL_VERSION" = "z" ; then
- PKG_CHECK_MODULES(OPENSSL, openssl >= 1.0.0,
- [OPENSSL_VERSION="1.0.0"],
- [OPENSSL_VERSION=""])
- fi
+dnl Priority 3: Guess with pkg_config
+if test "z$OPENSSL_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
+ PKG_CHECK_MODULES(OPENSSL, openssl >= $OPENSSL_MIN_VERSION,
+ [OPENSSL_FOUND=yes],
+ [OPENSSL_FOUND=no])
+fi
- if test "z$OPENSSL_VERSION" = "z" ; then
- PKG_CHECK_MODULES(OPENSSL, openssl >= $OPENSSL_MIN_VERSION,
- [OPENSSL_VERSION="$OPENSSL_MIN_VERSION"],
- [OPENSSL_VERSION=""])
+dnl Priority 4: Guess using a list of folders (do not overwrite CFLAGS/LIBS flags).
+if test "z$OPENSSL_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then
+ AC_MSG_CHECKING(for openssl library installation in the typical folders)
+ if test "z$OPENSSL_INCLUDE_PATH" = "z" ; then
+ AX_FIND_FOLDER(OPENSSL_INCLUDE_PATH, $OPENSSL_INCLUDE_MARKER, $OPENSSL_INCLUDE_DIR)
fi
-
- if test "z$OPENSSL_VERSION" != "z" ; then
+ if test "z$OPENSSL_LIB_PATH" = "z" ; then
+ AX_FIND_FOLDER(OPENSSL_LIB_PATH, $OPENSSL_LIB_SHARED_MARKER, $OPENSSL_LIB_DIR)
+ fi
+ if test "z$OPENSSL_LIB_PATH" = "z" ; then
+ AX_FIND_FOLDER(OPENSSL_LIB_PATH, $OPENSSL_LIB_STATIC_MARKER, $OPENSSL_LIB_DIR)
+ fi
+ if test "z$OPENSSL_INCLUDE_PATH" != "z" -a "z$OPENSSL_LIB_PATH" != "z" ; then
OPENSSL_FOUND="yes"
+ AC_MSG_RESULT([yes ("-I$OPENSSL_INCLUDE_PATH -L$OPENSSL_LIB_PATH")])
+ else
+ AC_MSG_RESULT([not found])
fi
fi
+dnl Priority 5: Just try to compile/link and hope for the best
if test "z$OPENSSL_FOUND" = "zno" ; then
- OPENSSL_INCLUDES_FOUND="no"
- OPENSSL_LIBS_FOUND="no"
-
- for dir in $ac_openssl_inc_dir ; do
- if test -f $dir/openssl/ssl.h ; then
- dnl do not add -I/usr/include because compiler does it anyway
- if test "z$dir" = "z/usr/include" ; then
- OPENSSL_CFLAGS="$OPENSSL_CFLAGS "
- else
- OPENSSL_CFLAGS="$OPENSSL_CFLAGS -I$dir"
- fi
- OPENSSL_INCLUDES_FOUND="yes"
- break
- fi
- done
+ AC_MSG_CHECKING(for openssl library installation)
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $OPENSSL_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $OPENSSL_LIBS $OPENSSL_LIBS_LIST"
+ AC_LINK_IFELSE([
+ AC_LANG_PROGRAM([[
+ #include <openssl/opensslv.h>
+ ]],[[
+ int main () {
+ #if OPENSSL_VERSION_NUMBER < 0x10100000L
+ SSL_library_init();
+ #else
+ OPENSSL_init_ssl(0, NULL);
+ #endif
+ return(0);
+ }
+ ]])
+ ],[
+ OPENSSL_FOUND=yes
+ OPENSSL_LIBS="$OPENSSL_LIBS $OPENSSL_LIBS_LIST"
+ AC_MSG_RESULT([yes])
+ ],[
+ OPENSSL_FOUND=no
+ AC_MSG_RESULT([not found])
+ ])
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
+fi
- for dir in $ac_openssl_lib_dir ; do
- if test -f $dir/libcrypto.a ; then
- dnl do not add -L/usr/lib because compiler does it anyway
- if test "z$dir" = "z/usr/lib" ; then
- OPENSSL_LIBS="-lcrypto -ldl"
- else
- OPENSSL_LIBS="-L$dir -lcrypto -ldl"
- fi
- OPENSSL_LIBS_FOUND="yes"
- ac_found_openssl_lib_dir=$dir
- break;
- fi
- done
-
- if test "z$OPENSSL_INCLUDES_FOUND" = "zyes" -a "z$OPENSSL_LIBS_FOUND" = "zyes" ; then
- OPENSSL_FOUND="yes"
+dnl Set flags if INCLUDE_PATH or LIB_PATH are set
+if test "z$OPENSSL_FOUND" = "zyes" -a "z$OPENSSL_INCLUDE_PATH" != "z" ; then
+ OPENSSL_CFLAGS="$OPENSSL_CFLAGS -I$OPENSSL_INCLUDE_PATH -I$OPENSSL_INCLUDE_PATH/openssl"
+fi
+if test "z$OPENSSL_FOUND" = "zyes" -a "z$OPENSSL_LIB_PATH" != "z" ; then
+ if test -f "$OPENSSL_LIB_PATH/$OPENSSL_LIB_SHARED_MARKER" ; then
+ if test "z$with_gnu_ld" = "zyes" ; then
+ OPENSSL_LIBS="$OPENSSL_LIBS -Wl,-rpath-link -Wl,$OPENSSL_LIB_PATH"
+ fi
+ OPENSSL_LIBS="$OPENSSL_LIBS -L$OPENSSL_LIB_PATH $OPENSSL_LIBS_LIST"
+ elif test -f $OPENSSL_LIB_PATH/$OPENSSL_LIB_STATIC_MARKER ; then
+ OPENSSL_LIBS="$OPENSSL_LIBS $OPENSSL_LIB_PATH/libcrypto.a"
fi
+ OPENSSL_LIBS="$OPENSSL_LIBS $OPENSSL_EXTRA_LIBS"
fi
-if test "z$OPENSSL_FOUND" = "zyes" -a "z$OPENSSL_VERSION" = "z" ; then
- AC_MSG_CHECKING(for openssl libraries >= $OPENSSL_MIN_VERSION)
-
- dnl Check the OpenSSL version; if you change this code then you probably
- dnl want to change include/openssl/crypto.h as well.
+dnl Check the OpenSSL version; if you change this code then you probably want to
+dnl change include/openssl/crypto.h as well.
+AC_MSG_CHECKING(for openssl library >= $OPENSSL_MIN_VERSION)
+if test "z$OPENSSL_FOUND" = "zyes" ; then
OLD_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$OPENSSL_CFLAGS"
-
+ CPPFLAGS="$CPPFLAGS $OPENSSL_CFLAGS"
if test "z$OPENSSL_VERSION" = "z" ; then
- AC_EGREP_CPP(yes,[
+ AC_EGREP_CPP(greater-than-minvers, [
#include <openssl/opensslv.h>
- #if OPENSSL_VERSION_NUMBER == 0x20000000L && defined(LIBRESSL_VERSION_NUMBER)
- yes
- #endif
- ],[
- OPENSSL_VERSION="1.0.0 (libressl)"
- ],[
- OPENSSL_VERSION=""
- ])
+ #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L
+ greater-than-minvers
+ #endif
+ ],[
+ OPENSSL_VERSION="1.0.0 (LibreSSL < 2.7)"
+ ],[
+ OPENSSL_VERSION=""
+ ])
fi
if test "z$OPENSSL_VERSION" = "z" ; then
- AC_EGREP_CPP(yes,[
+ AC_EGREP_CPP(greater-than-minvers, [
#include <openssl/opensslv.h>
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L
- yes
- #endif
- ],[
- OPENSSL_VERSION="1.1.0"
- ],[
- OPENSSL_VERSION=""
- ])
+ #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
+ greater-than-minvers
+ #endif
+ ],[
+ OPENSSL_VERSION="1.1.0 (LibreSSL >= 2.7)"
+ ],[
+ OPENSSL_VERSION=""
+ ])
fi
if test "z$OPENSSL_VERSION" = "z" ; then
- AC_EGREP_CPP(yes,[
- #include <openssl/opensslv.h>
- #if OPENSSL_VERSION_NUMBER >= 0x10000000L
- yes
- #endif
- ],[
- OPENSSL_VERSION="1.0.0"
- ],[
- OPENSSL_VERSION=""
- ])
+ AC_EGREP_CPP(greater-than-minvers, [
+ #include <openssl/opensslv.h>
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ greater-than-minvers
+ #endif
+ ],[
+ OPENSSL_VERSION="1.1.0"
+ ],[
+ OPENSSL_VERSION=""
+ ])
fi
if test "z$OPENSSL_VERSION" = "z" ; then
- AC_MSG_RESULT(no)
- else
- AC_MSG_RESULT([yes ('$OPENSSL_VERSION')])
+ AC_EGREP_CPP(greater-than-minvers, [
+ #include <openssl/opensslv.h>
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ greater-than-minvers
+ #endif
+ ],[
+ OPENSSL_VERSION="1.0.0"
+ ],[
+ OPENSSL_VERSION=""
+ ])
fi
-
CPPFLAGS=$OLD_CPPFLAGS
-fi
+ if test "z$OPENSSL_VERSION" != "z" ; then
+ OPENSSL_FOUND=yes
+ else
+ OPENSSL_FOUND=no
+ fi
+fi
+if test "z$OPENSSL_FOUND" = "zyes" ; then
+ AC_MSG_RESULT([yes (openssl version '$OPENSSL_VERSION')])
+else
+ AC_MSG_RESULT([$OPENSSL_FOUND])
+fi
+
+dnl Finally set all the flags
if test "z$OPENSSL_FOUND" = "zyes" ; then
XMLSEC_NO_OPENSSL="0"
OPENSSL_CFLAGS="$OPENSSL_CFLAGS -DXMLSEC_CRYPTO_OPENSSL=1"
@@ -542,7 +834,7 @@ else
XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST openssl"
fi
-AM_CONDITIONAL(XMLSEC_NO_OPENSSL, test "z$XMLSEC_NO_OPENSSL" == "z1")
+AM_CONDITIONAL(XMLSEC_NO_OPENSSL, test "z$XMLSEC_NO_OPENSSL" = "z1")
AC_SUBST(XMLSEC_NO_OPENSSL)
AC_SUBST(OPENSSL_CFLAGS)
AC_SUBST(OPENSSL_LIBS)
@@ -563,232 +855,295 @@ dnl AND / OR
dnl
dnl 2. separate NSS & NSPR distributions
dnl options: [--with-nss=<PFX>] [--with-nspr=<PFX>]
-dnl
+dnl
dnl 2 overrides 1
dnl
dnl ==========================================================================
-XMLSEC_NO_NSS="1"
-SEAMONKEY_MIN_VERSION="1.0"
-MOZILLA_MIN_VERSION="1.4"
NSS_MIN_VERSION="3.11.1"
NSPR_MIN_VERSION="4.4.1"
-NSS_CFLAGS=""
-NSS_LIBS=""
-NSS_LIBS_LIST="-lnss3 -lsmime3"
-NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
+SEAMONKEY_MIN_VERSION="1.0"
+MOZILLA_MIN_VERSION="1.4"
NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
-NSS_FOUND="no"
NSPR_PACKAGE=mozilla-nspr
NSS_PACKAGE=mozilla-nss
+NSPR_INCLUDE_MARKER="nspr/nspr.h"
+NSPR_LIB_MARKER="libnspr4$shrext"
+NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
+NSS_INCLUDE_MARKER="nss/nss.h"
+NSS_LIB_MARKER="libnss3$shrext"
+NSS_LIBS_LIST="-lnss3 -lsmime3"
-
-dnl if nss is disabled, bail out early
-AC_ARG_WITH(nss, [ --with-nss=[PFX] nss location])
-AC_ARG_WITH(nspr, [ --with-nspr=[PFX] nspr location (needed for NSS)])
-AC_ARG_WITH(seamonkey_ver, [ --with-seamonkey-ver=[VER] mozilla version (alt to --with-nss, --with-nspr)])
-AC_ARG_WITH(mozilla_ver, [ --with-mozilla-ver=[VER] mozilla version (alt to --with-nss, --with-nspr)])
+XMLSEC_NO_NSS="1"
+NSPR_INCLUDE_PATH=
+NSPR_LIB_PATH=
+NSS_INCLUDE_PATH=
+NSS_LIB_PATH=
+NSS_FOUND="no"
+NSPR_FOUND="no"
+AC_ARG_WITH(nss,
+ [ --with-nss=[PFX] nss location])
+AC_ARG_WITH(nspr,
+ [ --with-nspr=[PFX] nspr location (needed for NSS)])
+AC_ARG_WITH(seamonkey_ver,
+ [ --with-seamonkey-ver=[VER] mozilla version (alt to --with-nss, --with-nspr)])
+AC_ARG_WITH(mozilla_ver,
+ [ --with-mozilla-ver=[VER] mozilla version (alt to --with-nss, --with-nspr)])
+
+dnl Priority 0: Check if library is disabled
if test "z$with_nss" = "zno" -o "z$with_nspr" = "zno" ; then
- AC_MSG_CHECKING(for NSS libraries)
- AC_MSG_RESULT(no)
- NSS_FOUND="without"
-elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$with_seamonkey_ver" = "z" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
- dnl
- dnl Mozilla's NSS/NSPR are distributed under different names
- dnl in different distribution:
- dnl seamonkey-nspr and seamonkey-nss
- dnl mozilla-nspr and mozilla-nss
- dnl xulrunner-nspr and xulrunner-nss
- dnl nspr and nss
- dnl We are going to try all options
- dnl
+ NSS_FOUND="disabled"
+ NSPR_FOUND="disabled"
+fi
+
+dnl Priority 1: User specifies the path to installation
+if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then
+ AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder)
+ if test -f "$with_nspr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/lib/$NSPR_LIB_MARKER" ; then
+ NSPR_INCLUDE_PATH="$with_nspr/include"
+ NSPR_LIB_PATH="$with_nspr/lib"
+ NSPR_FOUND="yes"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER" files don't exist), typo?])
+ fi
+fi
+if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then
+ AC_MSG_CHECKING(for nss library installation in "$with_nss" folder)
+ if test -f "$with_nss/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/lib/$NSS_LIB_MARKER" ; then
+ NSS_INCLUDE_PATH="$with_nss/include"
+ NSS_LIB_PATH="$with_nss/lib"
+ NSS_FOUND="yes"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER" files don't exist), typo?])
+ fi
+fi
+
+dnl Priority 2: User sets both CFLAGS and LIBS flags
+if test "z$NSPR_FOUND" = "zno" -a "z$NSPR_CFLAGS" != "z" -a "z$NSPR_LIBS" != "z" ; then
+ NSPR_FOUND="yes"
+fi
+if test "z$NSS_FOUND" = "zno" -a "z$NSS_CFLAGS" != "z" -a "z$NSS_LIBS" != "z" ; then
+ NSS_FOUND="yes"
+fi
+
+dnl Priority 3: Guess with pkg_config
+dnl
+dnl Mozilla's NSS/NSPR are distributed under different names in different distribution,
+dnl we are going to try all options:
+dnl seamonkey-nspr and seamonkey-nss
+dnl mozilla-nspr and mozilla-nss
+dnl xulrunner-nspr and xulrunner-nss
+dnl nspr and nss
+if test "z$NSPR_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" -a "z$with_mozilla_ver" = "z" -a "z$with_seamonkey_ver" ; then
+ if test "z$NSPR_FOUND" = "zno" ; then
+ PKG_CHECK_MODULES(NSPR, seamonkey-nspr >= $NSPR_MIN_VERSION,
+ [NSPR_FOUND=yes NSPR_PACKAGE=seamonkey-nspr],
+ [NSPR_FOUND=no])
+ fi
+ if test "z$NSPR_FOUND" = "zno" ; then
+ PKG_CHECK_MODULES(NSPR, mozilla-nspr >= $MOZILLA_MIN_VERSION,
+ [NSPR_FOUND=yes NSPR_PACKAGE=mozilla-nspr],
+ [NSPR_FOUND=no])
+ fi
+ if test "z$NSPR_FOUND" = "zno" ; then
+ PKG_CHECK_MODULES(NSPR, xulrunner-nspr >= $NSPR_MIN_VERSION,
+ [NSPR_FOUND=yes NSPR_PACKAGE=xulrunner-nspr],
+ [NSPR_FOUND=no])
+ fi
+ if test "z$NSPR_FOUND" = "zno" ; then
+ PKG_CHECK_MODULES(NSPR, nspr >= $NSPR_MIN_VERSION,
+ [NSPR_FOUND=yes NSPR_PACKAGE=nspr],
+ [NSPR_FOUND=no])
+ fi
+fi
+if test "z$NSS_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" -a "z$with_mozilla_ver" = "z" -a "z$with_seamonkey_ver" ; then
if test "z$NSS_FOUND" = "zno" ; then
- PKG_CHECK_MODULES(NSS, seamonkey-nspr >= $NSPR_MIN_VERSION seamonkey-nss >= $SEAMONKEY_MIN_VERSION,
- [NSS_FOUND=yes NSPR_PACKAGE=seamonkey-nspr NSS_PACKAGE=seamonkey-nss],
- [NSS_FOUND=no])
+ PKG_CHECK_MODULES(NSS, seamonkey-nss >= $SEAMONKEY_MIN_VERSION,
+ [NSS_FOUND=yes NSS_PACKAGE=seamonkey-nss],
+ [NSS_FOUND=no])
fi
if test "z$NSS_FOUND" = "zno" ; then
- PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION,
- [NSS_FOUND=yes NSPR_PACKAGE=mozilla-nspr NSS_PACKAGE=mozilla-nss],
- [NSS_FOUND=no])
+ PKG_CHECK_MODULES(NSS, mozilla-nss >= $MOZILLA_MIN_VERSION,
+ [NSS_FOUND=yes NSS_PACKAGE=mozilla-nss],
+ [NSS_FOUND=no])
fi
if test "z$NSS_FOUND" = "zno" ; then
- PKG_CHECK_MODULES(NSS, xulrunner-nspr >= $NSPR_MIN_VERSION xulrunner-nss >= $NSS_MIN_VERSION,
- [NSS_FOUND=yes NSPR_PACKAGE=xulrunner-nspr NSS_PACKAGE=xulrunner-nss],
- [NSS_FOUND=no])
+ PKG_CHECK_MODULES(NSS, xulrunner-nss >= $NSS_MIN_VERSION,
+ [NSS_FOUND=yes NSS_PACKAGE=xulrunner-nss],
+ [NSS_FOUND=no])
fi
if test "z$NSS_FOUND" = "zno" ; then
- PKG_CHECK_MODULES(NSS, nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION,
- [NSS_FOUND=yes NSPR_PACKAGE=nspr NSS_PACKAGE=nss],
- [NSS_FOUND=no])
+ PKG_CHECK_MODULES(NSS, nss >= $NSS_MIN_VERSION,
+ [NSS_FOUND=yes NSS_PACKAGE=nss],
+ [NSS_FOUND=no])
fi
fi
-if test "z$NSS_FOUND" = "zno" ; then
- dnl process the mozilla options if any
- if test "z$with_seamonkey_ver" != "z" ; then
- ac_mozilla_name=seamonkey-$with_seamonkey_ver
- elif test "z$with_mozilla_ver" != "z" ; then
- ac_mozilla_name=mozilla-$with_mozilla_ver
- else
- ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
- fi
-
- ac_nss_lib_dir="/usr/lib /usr/lib64 /usr/local/lib /usr/lib/$ac_mozilla_name /usr/local/lib/$ac_mozilla_name"
- ac_nss_inc_dir="/usr/include /usr/include/mozilla /usr/local/include /usr/local/include/mozilla /usr/include/$ac_mozilla_name /usr/local/include/$ac_mozilla_name"
-
- AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION)
- NSPR_INCLUDES_FOUND="no"
- NSPR_LIBS_FOUND="no"
- NSPR_FOUND="no"
- NSPR_PRINIT_H=""
-
- if test "z$with_nspr" != "z" ; then
- NSPR_PREFIX="$with_nspr"
- NSPR_CFLAGS="-I$with_nspr/include -I$with_nspr/include/nspr"
- if test "z$with_gnu_ld" = "zyes" ; then
- NSPR_LIBS="-Wl,-rpath-link -Wl,$with_nspr/lib -L$with_nspr/lib $NSPR_LIBS_LIST"
- else
- NSPR_LIBS="-L$with_nspr/lib $NSPR_LIBS_LIST"
- fi
- NSPR_INCLUDES_FOUND="yes"
- NSPR_LIBS_FOUND="yes"
- NSPR_PRINIT_H="$with_nspr/include/prinit.h"
+dnl Priority 4: Guess using a list of folders using mozilla/seamonkey version hints (if any)
+if test "z$with_seamonkey_ver" != "z" ; then
+ NSS_MOZILLA_NAME=seamonkey-$with_seamonkey_ver
+elif test "z$with_mozilla_ver" != "z" ; then
+ NSS_MOZILLA_NAME=mozilla-$with_mozilla_ver
+else
+ NSS_MOZILLA_NAME=mozilla-$MOZILLA_MIN_VERSION
+fi
+NSS_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/include/mozilla /usr/local/include/mozilla /usr/include/$NSS_MOZILLA_NAME /usr/local/include/$NSS_MOZILLA_NAME"
+NSS_LIB_DIR="$COMMON_LIB_DIR /usr/lib/$NSS_MOZILLA_NAME /usr/local/lib/$NSS_MOZILLA_NAME"
+if test "z$NSPR_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then
+ AC_MSG_CHECKING(for nspr library installation in the typical folders)
+ if test "z$NSPR_INCLUDE_PATH" = "z" ; then
+ AX_FIND_FOLDER(NSPR_INCLUDE_PATH, $NSPR_INCLUDE_MARKER, $NSS_INCLUDE_DIR)
+ fi
+ if test "z$NSPR_LIB_PATH" = "z" ; then
+ AX_FIND_FOLDER(NSPR_LIB_PATH, $NSPR_LIB_MARKER, $NSS_LIB_DIR)
+ fi
+ if test "z$NSPR_INCLUDE_PATH" != "z" -a "z$NSPR_LIB_PATH" != "z" ; then
+ NSPR_FOUND=yes
+ AC_MSG_RESULT([yes ("-I$NSPR_INCLUDE_PATH -L$NSPR_LIB_PATH")])
else
- for dir in $ac_nss_inc_dir ; do
- if test -f $dir/nspr/prinit.h ; then
- dnl do not add -I/usr/include because compiler does it anyway
- if test "z$dir" = "z/usr/include" ; then
- NSPR_CFLAGS=""
- else
- NSPR_CFLAGS="-I$dir/nspr"
- fi
- NSPR_INCLUDES_FOUND="yes"
- NSPR_PRINIT_H="$dir/nspr/prinit.h"
- break
- fi
- done
-
- for dir in $ac_nss_lib_dir ; do
- if test -f $dir/libnspr4$shrext ; then
- dnl do not add -L/usr/lib because compiler does it anyway
- if test "z$dir" = "z/usr/lib" ; then
- NSPR_LIBS="$NSPR_LIBS_LIST"
- else
- if test "z$with_gnu_ld" = "zyes" ; then
- NSPR_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSPR_LIBS_LIST"
- else
- NSPR_LIBS="-L$dir $NSPR_LIBS_LIST"
- fi
- fi
- NSPR_LIBS_FOUND="yes"
- break
- fi
- done
- fi
-
- if test "z$NSPR_INCLUDES_FOUND" = "zyes" -a "z$NSPR_LIBS_FOUND" = "zyes" ; then
- OLD_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$NSPR_CFLAGS"
- AC_EGREP_CPP(yes,[
- #include <prinit.h>
- #if PR_VMAJOR >= 4
- yes
- #endif
- ],[
- NSPR_FOUND=yes
- ],[
- NSPR_FOUND=no
- ])
- CPPFLAGS="$OLD_CPPFLAGS"
- fi
-
- if test "z$NSPR_FOUND" = "zyes" ; then
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([not found])
+ fi
+fi
+if test "z$NSS_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then
+ AC_MSG_CHECKING(for nss library installation in the typical folders)
+ if test "z$NSS_INCLUDE_PATH" = "z" ; then
+ AX_FIND_FOLDER(NSS_INCLUDE_PATH, $NSS_INCLUDE_MARKER, $NSS_INCLUDE_DIR)
+ fi
+ if test "z$NSS_LIB_PATH" = "z" ; then
+ AX_FIND_FOLDER(NSS_LIB_PATH, $NSS_LIB_MARKER, $NSS_LIB_DIR)
+ fi
+ if test "z$NSS_INCLUDE_PATH" != "z" -a "z$NSS_LIB_PATH" != "z" ; then
+ NSS_FOUND=yes
+ AC_MSG_RESULT([yes ("-I$NSS_INCLUDE_PATH -L$NSS_LIB_PATH")])
else
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([not found])
fi
+fi
- dnl look for nss
- AC_MSG_CHECKING(for nss libraries >= $NSS_MIN_VERSION)
- NSS_INCLUDES_FOUND="no"
- NSS_LIBS_FOUND="no"
- NSS_NSS_H=""
+dnl Priority 5 (NSPR): Just try to compile/link and hope for the best
+if test "z$NSPR_FOUND" = "zno" ; then
+ AC_MSG_CHECKING(for nspr library installation)
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $NSPR_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $NSPR_LIBS $NSPR_LIBS_LIST"
+ AC_LINK_IFELSE([
+ AC_LANG_PROGRAM([[
+ #include <stdio.h>
+ #include <nspr/nspr.h>
+ ]],[[
+ int main () { printf("v=%s\n", PR_GetVersion()); return(0); }
+ ]])
+ ],[
+ NSPR_FOUND=yes
+ NSPR_LIBS="$NSPR_LIBS $NSPR_LIBS_LIST"
+ AC_MSG_RESULT([yes])
+ ],[
+ NSPR_FOUND=no
+ AC_MSG_RESULT([not found])
+ ])
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
+fi
- if test "z$with_nss" != "z" ; then
- NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss"
- if test "z$with_gnu_ld" = "zyes" ; then
- NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST"
- else
- NSS_LIBS="$NSS_LIBS -L$with_nss/lib $NSS_LIBS_LIST"
- fi
- NSS_INCLUDES_FOUND="yes"
- NSS_LIBS_FOUND="yes"
- NSS_NSS_H="$with_nss/include/nss.h"
- else
- for dir in $ac_nss_inc_dir ; do
- if test -f $dir/nss/nss.h ; then
- dnl do not add -I/usr/include because compiler does it anyway
- if test "z$dir" = "z/usr/include" ; then
- NSS_CFLAGS="$NSS_CFLAGS"
- else
- NSS_CFLAGS="$NSS_CFLAGS -I$dir/nss"
- fi
- NSS_INCLUDES_FOUND="yes"
- NSS_NSS_H="$dir/nss/nss.h"
- break
- fi
- done
-
- for dir in $ac_nss_lib_dir ; do
- if test -f $dir/libnss3$shrext ; then
- dnl do not add -L/usr/lib because compiler does it anyway
- if test "z$dir" = "z/usr/lib" ; then
- NSS_LIBS="$NSS_LIBS_LIST"
- else
- if test "z$with_gnu_ld" = "zyes" ; then
- NSS_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSS_LIBS_LIST"
- else
- NSS_LIBS="-L$dir $NSS_LIBS_LIST"
- fi
- fi
- NSS_LIBS_FOUND="yes"
- break
- fi
- done
- fi
-
- if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
- OLD_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$NSPR_CFLAGS $NSS_CFLAGS"
- AC_EGREP_CPP(yes,[
- #include <nss.h>
- #if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2
- yes
- #endif
- ],[
- NSS_FOUND=yes
- ],[
- NSS_FOUND=no
- ])
- CPPFLAGS="$OLD_CPPFLAGS"
- fi
-
- if test "z$NSS_FOUND" = "zyes" ; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
+dnl NSRP: Set flags if INCLUDE_PATH or LIB_PATH are set (need to do it before we try to find NSS)
+if test "z$NSPR_FOUND" = "zyes" -a "z$NSPR_INCLUDE_PATH" != "z" ; then
+ NSPR_CFLAGS="$NSPR_CFLAGS -I$NSPR_INCLUDE_PATH -I$NSPR_INCLUDE_PATH/nspr"
+fi
+if test "z$NSPR_FOUND" = "zyes" -a "z$NSPR_LIB_PATH" != "z" ; then
+ if test "z$with_gnu_ld" = "zyes" ; then
+ NSPR_LIBS="$NSPR_LIBS -Wl,-rpath-link -Wl,$NSPR_LIB_PATH"
fi
+ NSPR_LIBS="$NSPR_LIBS -L$NSPR_LIB_PATH/lib $NSPR_LIBS_LIST"
+fi
- dnl check that we have found both NSS and NSPR
- if test "z$NSPR_FOUND" = "zyes" -a "z$NSS_FOUND" = "zyes" ; then
- NSS_CFLAGS="$NSS_CFLAGS $NSPR_CFLAGS"
- NSS_LIBS="$NSS_LIBS $NSPR_LIBS"
- elif test "z$NSPR_FOUND" != "zyes" -a "z$NSS_FOUND" = "zyes" ; then
- NSS_FOUND="no"
- AC_MSG_RESULT(NSPR library is required for NSS, ignoring NSS library we have found)
+dnl Priority 5 (NSS): Just try to compile/link and hope for the best
+if test "z$NSS_FOUND" = "zno" ; then
+ AC_MSG_CHECKING(for nss library installation)
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $NSPR_CFLAGS $NSS_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $NSS_LIBS $NSPR_LIBS $NSS_LIBS_LIST"
+ AC_LINK_IFELSE([
+ AC_LANG_PROGRAM([[
+ #include <stdio.h>
+ #include <nss/nss.h>
+ ]],[[
+ int main () { printf("v=%s\n", NSS_GetVersion()); return(0); }
+ ]])
+ ],[
+ NSS_FOUND=yes
+ NSS_LIBS="$NSS_LIBS $NSS_LIBS_LIST"
+ AC_MSG_RESULT([yes])
+ ],[
+ NSS_FOUND=no
+ AC_MSG_RESULT([not found])
+ ])
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
+fi
+
+dnl NSS: Set flags if INCLUDE_PATH or LIB_PATH are set
+if test "z$NSS_FOUND" = "zyes" -a "z$NSS_INCLUDE_PATH" != "z" ; then
+ NSS_CFLAGS="$NSS_CFLAGS -I$NSS_INCLUDE_PATH -I$NSS_INCLUDE_PATH/nss"
+fi
+if test "z$NSS_FOUND" = "zyes" -a "z$NSS_LIB_PATH" != "z" ; then
+ if test "z$with_gnu_ld" = "zyes" ; then
+ NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$NSS_LIB_PATH"
fi
+ NSS_LIBS="$NSS_LIBS -L$NSS_LIB_PATH/lib $NSS_LIBS_LIST"
+fi
+
+dnl Check NSS and NSPR versions
+AC_MSG_CHECKING(for nspr library >= $NSPR_MIN_VERSION)
+if test "z$NSPR_FOUND" = "zyes" ; then
+ minvers=`echo $NSPR_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 100 + $2) * 100 + $3;}'`
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $NSPR_CFLAGS"
+ AC_EGREP_CPP(greater-than-minvers, [
+ #include <prinit.h>
+ #if ((PR_VMAJOR * 100 + PR_VMINOR) * 100 + PR_VPATCH) >= $minvers
+ greater-than-minvers
+ #endif
+ ],[
+ NSPR_FOUND=yes
+ ],[
+ NSPR_FOUND=no
+ ])
+ CPPFLAGS="$OLD_CPPFLAGS"
fi
+AC_MSG_RESULT([$NSPR_FOUND])
+AC_MSG_CHECKING(for nss library >= $NSS_MIN_VERSION)
+if test "z$NSS_FOUND" = "zyes" ; then
+ minvers=`echo $NSS_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 100 + $2) * 100 + $3;}'`
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $NSPR_CFLAGS $NSS_CFLAGS"
+ AC_EGREP_CPP(greater-than-minvers, [
+ #include <nss.h>
+ #if ((NSS_VMAJOR * 100 + NSS_VMINOR) * 100 + NSS_VPATCH) >= $minvers
+ greater-than-minvers
+ #endif
+ ],[
+ NSS_FOUND=yes
+ ],[
+ NSS_FOUND=no
+ ])
+ CPPFLAGS="$OLD_CPPFLAGS"
+fi
+AC_MSG_RESULT([$NSS_FOUND])
+
+dnl Check that we have found both NSS and NSPR
+if test "z$NSPR_FOUND" = "zyes" -a "z$NSS_FOUND" = "zyes" ; then
+ NSS_CFLAGS="$NSS_CFLAGS $NSPR_CFLAGS"
+ NSS_LIBS="$NSS_LIBS $NSPR_LIBS"
+elif test "z$NSPR_FOUND" != "zyes" -a "z$NSS_FOUND" = "zyes" ; then
+ NSS_FOUND="no"
+ AC_MSG_RESULT([NSPR library is required for NSS, ignoring NSS library we have found])
+fi
+
+dnl Finally set all the flags
if test "z$NSS_FOUND" = "zyes" ; then
XMLSEC_NO_NSS="0"
NSS_CFLAGS="$NSS_CFLAGS -DXMLSEC_CRYPTO_NSS=1"
@@ -808,71 +1163,181 @@ AC_SUBST(NSS_MIN_VERSION)
AC_SUBST(NSPR_MIN_VERSION)
AC_SUBST(MOZILLA_MIN_VERSION)
-
dnl ==========================================================================
dnl See if we can find GCrypt
dnl ==========================================================================
-GCRYPT_CONFIG="libgcrypt-config"
-XMLSEC_NO_GCRYPT="1"
GCRYPT_MIN_VERSION="1.4.0"
-GCRYPT_VERSION=""
-GCRYPT_CFLAGS=""
-GCRYPT_LIBS=""
+GCRYPT_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/local/gcrypt/include"
+GCRYPT_LIB_DIR="$COMMON_LIB_DIR /usr/local/gcrypt/lib"
+GCRYPT_CONFIG="libgcrypt-config"
+GCRYPT_INCLUDE_MARKER="gcrypt.h"
+GCRYPT_LIB_MARKER="libgcrypt$shrext"
GCRYPT_CRYPTO_LIB="$XMLSEC_PACKAGE-gcrypt"
+GCRYPT_LIBS_LIST="-lgcrypt"
+
+XMLSEC_NO_GCRYPT="1"
+GCRYPT_VERSION=
+GCRYPT_INCLUDE_PATH=
+GCRYPT_LIB_PATH=
GCRYPT_FOUND="no"
-AC_ARG_WITH(gcrypt, [ --with-gcrypt=[PFX] gcrypt location])
+AC_ARG_WITH(gcrypt,
+ [ --with-gcrypt=[PFX] gcrypt location])
+
+dnl Priority 0: Check if library is not needed
if test "z$with_gcrypt" = "zno" ; then
- GCRYPT_FOUND="without"
-elif test "z$with_gcrypt" = "z" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
- PKG_CHECK_MODULES(GCRYPT, gcrypt >= $GCRYPT_MIN_VERSION,
- [GCRYPT_FOUND=yes],
- [GCRYPT_FOUND=no])
+ GCRYPT_FOUND="disabled"
+fi
- if test "z$GCRYPT_FOUND" = "zno" ; then
- PKG_CHECK_MODULES(GCRYPT, libgcrypt >= $GCRYPT_MIN_VERSION,
- [GCRYPT_FOUND=yes],
- [GCRYPT_FOUND=no])
+dnl Priority 1: User specifies the path to installation
+if test "z$GCRYPT_FOUND" = "zno" -a "z$with_gcrypt" != "z" -a "z$with_gcrypt" != "zyes" ; then
+ AC_MSG_CHECKING(for libgcrypt library installation in "$with_gcrypt" folder)
+ if test "z$ENABLE_CUSTOM_CONFIGS" = "zyes" -a -f "$with_gcrypt/bin/$GCRYPT_CONFIG" ; then
+ GCRYPT_CONFIG_PATH="$with_gcrypt/bin/$GCRYPT_CONFIG"
+ GCRYPT_FOUND="yes"
+ AC_MSG_RESULT([yes])
+ elif test -f "$with_gcrypt/include/$GCRYPT_INCLUDE_MARKER" -a -f "$with_gcrypt/lib/$GCRYPT_LIB_MARKER" ; then
+ GCRYPT_INCLUDE_PATH="$with_gcrypt/include"
+ GCRYPT_LIB_PATH="$with_gcrypt/lib"
+ GCRYPT_FOUND="yes"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_ERROR([not found: "$with_gcrypt/bin/$GCRYPT_CONFIG" tool, or "$with_gcrypt/include/$GCRYPT_INCLUDE_MARKER" and/or "$with_gcrypt/lib/$GCRYPT_LIB_MARKER" files don't exist), typo?])
fi
+fi
+dnl Priority 2: User sets both CFLAGS and LIBS flags
+if test "z$GCRYPT_FOUND" = "zno" -a "z$GCRYPT_CFLAGS" != "z" -a "z$GCRYPT_LIBS" != "z" ; then
+ GCRYPT_FOUND="yes"
+fi
+
+dnl Priority 3: Guess with pkg_config
+if test "z$GCRYPT_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
+ if test "z$GCRYPT_FOUND" = "zno" ; then
+ PKG_CHECK_MODULES(GCRYPT, gcrypt >= $GCRYPT_MIN_VERSION,
+ [GCRYPT_FOUND=yes],
+ [GCRYPT_FOUND=no])
+ fi
+ if test "z$GCRYPT_FOUND" = "zno" ; then
+ PKG_CHECK_MODULES(GCRYPT, libgcrypt20 >= $GCRYPT_MIN_VERSION,
+ [GCRYPT_FOUND=yes],
+ [GCRYPT_FOUND=no])
+ fi
if test "z$GCRYPT_FOUND" = "zno" ; then
PKG_CHECK_MODULES(GCRYPT, libgcrypt11 >= $GCRYPT_MIN_VERSION,
- [GCRYPT_FOUND=yes],
- [GCRYPT_FOUND=no])
+ [GCRYPT_FOUND=yes],
+ [GCRYPT_FOUND=no])
+ fi
+ if test "z$GCRYPT_FOUND" = "zno" ; then
+ PKG_CHECK_MODULES(GCRYPT, libgcrypt >= $GCRYPT_MIN_VERSION,
+ [GCRYPT_FOUND=yes],
+ [GCRYPT_FOUND=no])
+ fi
+fi
+
+dnl Priority 4: Guess the config tool location
+if test "z$GCRYPT_FOUND" = "zno" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then
+ AC_PATH_PROG(GCRYPT_CONFIG_PATH, [$GCRYPT_CONFIG], [], [$PATH])
+ if test "z$GCRYPT_CONFIG_PATH" != "z" ; then
+ GCRYPT_FOUND="yes"
+ fi
+fi
+
+dnl Priority 5: Guess using a list of folders.
+if test "z$GCRYPT_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then
+ AC_MSG_CHECKING(for libgcrypt library installation in the typical folders)
+ if test "z$GCRYPT_INCLUDE_PATH" = "z" ; then
+ AX_FIND_FOLDER(GCRYPT_INCLUDE_PATH, $GCRYPT_INCLUDE_MARKER, $GCRYPT_INCLUDE_DIR)
+ fi
+ if test "z$GCRYPT_LIB_PATH" = "z" ; then
+ AX_FIND_FOLDER(GCRYPT_LIB_PATH, $GCRYPT_LIB_MARKER, $GCRYPT_LIB_DIR)
+ fi
+ if test "z$GCRYPT_INCLUDE_PATH" != "z" -a "z$GCRYPT_LIB_PATH" != "z" ; then
+ GCRYPT_FOUND="yes"
+ AC_MSG_RESULT([yes ("-I$GCRYPT_INCLUDE_PATH -L$GCRYPT_LIB_PATH")])
+ else
+ AC_MSG_RESULT([not found])
fi
fi
+dnl Priority 6: Just try to compile/link and hope for the best
if test "z$GCRYPT_FOUND" = "zno" ; then
- if test "z$with_gcrypt" != "z" ; then
- GCRYPT_CONFIG=$with_gcrypt/bin/$GCRYPT_CONFIG
- fi
- if ! $GCRYPT_CONFIG --version > /dev/null 2>&1 ; then
- if test "z$with_gcrypt" != "z" ; then
- AC_MSG_ERROR(Unable to find gcrypt at '$with_gcrypt')
- else
- AC_MSG_RESULT(no)
- fi
+ AC_MSG_CHECKING(for gcrypt library installation)
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $GCRYPT_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $GCRYPT_LIBS $GCRYPT_LIBS_LIST"
+ AC_LINK_IFELSE([
+ AC_LANG_PROGRAM([[
+ #include <gcrypt.h>
+ ]],[[
+ int main () { printf("v=%s\n", gcry_check_version("0")); return(0); }
+ ]])
+ ],[
+ GCRYPT_FOUND=yes
+ GCRYPT_LIBS="$GCRYPT_LIBS $GCRYPT_LIBS_LIST"
+ AC_MSG_RESULT([yes])
+ ],[
+ GCRYPT_FOUND=no
+ AC_MSG_RESULT([not found])
+ ])
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
+fi
+
+dnl Set CFLAGS/LIBS flags
+if test "z$GCRYPT_FOUND" = "zyes" ; then
+ if test "z$GCRYPT_CONFIG_PATH" != "z" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then
+ dnl Get the values using config tool (overwrite CFLAGS/LIBS!)
+ if test "z$GCRYPT_CFLAGS" = "z" ; then
+ GCRYPT_CFLAGS="`$GCRYPT_CONFIG_PATH --cflags`"
+ fi
+ if test "z$GCRYPT_LIBS" = "z"; then
+ GCRYPT_LIBS="`$GCRYPT_CONFIG_PATH --libs`"
+ fi
+ GCRYPT_CONFIG=$GCRYPT_CONFIG_PATH
+ GCRYPT_FOUND="yes"
else
- vers=`$GCRYPT_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- minvers=`echo $GCRYPT_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- if test "$vers" -ge "$minvers" ; then
- GCRYPT_CFLAGS="$GCRYPT_CFLAGS `$GCRYPT_CONFIG --cflags`"
- GCRYPT_LIBS="$GCRYPT_LIBS `$GCRYPT_CONFIG --libs`"
- GCRYPT_FOUND=yes
- else
- AC_MSG_ERROR(You need at least gcrypt $GCRYPT_MIN_VERSION for this version of $XMLSEC_PACKAGE)
- fi
+ dnl Set flags if INCLUDE_PATH or LIB_PATH are set (do NOT overwrite CFLAGS/LIBS!)
+ if test "z$GCRYPT_INCLUDE_PATH" != "z" ; then
+ GCRYPT_CFLAGS="$GCRYPT_CFLAGS -I$GCRYPT_INCLUDE_PATH"
+ fi
+ if test "z$GCRYPT_LIB_PATH" != "z" ; then
+ if test "z$with_gnu_ld" = "zyes" ; then
+ GCRYPT_LIBS="$GCRYPT_LIBS -Wl,-rpath-link -Wl,$GCRYPT_LIB_PATH"
+ fi
+ GCRYPT_LIBS="$GCRYPT_LIBS -L$GCRYPT_LIB_PATH $GCRYPT_LIBS_LIST"
+ fi
fi
fi
-AC_MSG_CHECKING(for gcrypt libraries >= $GCRYPT_MIN_VERSION)
-if test "z$GCRYPT_FOUND" = "zyes" ; then
+dnl Verify the version
+AC_MSG_CHECKING(for libgcrypt library >= $GCRYPT_MIN_VERSION)
+if test "z$GCRYPT_FOUND" = "zyes" ; then
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $GCRYPT_CFLAGS"
+ dnl gcrypt uses hex digits for version number
+ minvers=`echo $GCRYPT_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 256 + $2) * 256 + $3;}'`
+ AC_EGREP_CPP(greater-than-minvers, [
+ #include <gcrypt.h>
+ #if GCRYPT_VERSION_NUMBER >= $minvers
+ greater-than-minvers
+ #endif
+ ],[
+ GCRYPT_FOUND=yes
+ ], [
+ GCRYPT_FOUND=no
+ ])
+ CPPFLAGS=$OLD_CPPFLAGS
+fi
+AC_MSG_RESULT([$GCRYPT_FOUND])
+
+dnl Finally set variables
+if test "z$GCRYPT_FOUND" = "zyes" ; then
XMLSEC_NO_GCRYPT="0"
GCRYPT_CFLAGS="$GCRYPT_CFLAGS -DXMLSEC_CRYPTO_GCRYPT=1"
XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST gcrypt"
- AC_MSG_RESULT(yes)
else
XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST gcrypt"
- AC_MSG_RESULT(no)
fi
AM_CONDITIONAL(XMLSEC_NO_GCRYPT, test "z$XMLSEC_NO_GCRYPT" = "z1")
@@ -882,64 +1347,151 @@ AC_SUBST(GCRYPT_LIBS)
AC_SUBST(GCRYPT_CRYPTO_LIB)
AC_SUBST(GCRYPT_MIN_VERSION)
-
dnl ==========================================================================
dnl See if we can find GnuTLS
dnl ==========================================================================
-XMLSEC_NO_GNUTLS="1"
GNUTLS_MIN_VERSION="2.8.0"
-GNUTLS_VERSION=""
-GNUTLS_CFLAGS=""
-GNUTLS_LIBS=""
+GNUTLS_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/local/gnutls/include"
+GNUTLS_LIB_DIR="$COMMON_LIB_DIR /usr/local/gnutls/lib"
+GNUTLS_INCLUDE_MARKER="gnutls/gnutls.h"
+GNUTLS_LIB_MARKER="libgnutls$shrext"
GNUTLS_CRYPTO_LIB="$XMLSEC_PACKAGE-gnutls"
+GNUTLS_LIBS_LIST="-lgnutls"
+
+XMLSEC_NO_GNUTLS="1"
+GNUTLS_INCLUDE_PATH=
+GNUTLS_LIB_PATH=
GNUTLS_FOUND="no"
-AC_ARG_WITH(gnutls, [ --with-gnutls=[PFX] gnutls location])
+AC_ARG_WITH(gnutls,
+ [ --with-gnutls=[PFX] gnutls location])
+
+dnl Priority 0: Check if library is not needed
if test "z$with_gnutls" = "zno" ; then
- GNUTLS_FOUND="without"
-elif test "z$with_gnutls" = "z" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
- PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_MIN_VERSION,
- [GNUTLS_FOUND=yes],
- [GNUTLS_FOUND=no])
- if test "z$GNUTLS_FOUND" = "zno" ; then
+ GNUTLS_FOUND="disabled"
+fi
+
+dnl Priority 1: User specifies the path to installation
+if test "z$GNUTLS_FOUND" = "zno" -a "z$with_gnutls" != "z" -a "z$with_gnutls" != "zyes" ; then
+ AC_MSG_CHECKING(for libgnutls library installation in "$with_gnutls" folder)
+ if test -f "$with_gnutls/include/$GNUTLS_INCLUDE_MARKER" -a -f "$with_gnutls/lib/$GNUTLS_LIB_MARKER" ; then
+ GNUTLS_INCLUDE_PATH="$with_gnutls/include"
+ GNUTLS_LIB_PATH="$with_gnutls/lib"
+ GNUTLS_FOUND="yes"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_ERROR([not found: "$with_gnutls/bin/$GNUTLS_CONFIG" tool, or "$with_gnutls/include/$GNUTLS_INCLUDE_MARKER" and/or "$with_gnutls/lib/$GNUTLS_LIB_MARKER" files don't exist), typo?])
+ fi
+fi
+
+dnl Priority 2: User sets both CFLAGS and LIBS flags
+if test "z$GNUTLS_FOUND" = "zno" -a "z$GNUTLS_CFLAGS" != "z" -a "z$GNUTLS_LIBS" != "z" ; then
+ GNUTLS_FOUND="yes"
+fi
+
+dnl Priority 3: Guess with pkg_config
+if test "z$GNUTLS_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
+ if test "z$GNUTLS_FOUND" = "zno" ; then
+ PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_MIN_VERSION,
+ [GNUTLS_FOUND=yes],
+ [GNUTLS_FOUND=no])
+ fi
+ if test "z$GNUTLS_FOUND" = "zno" ; then
PKG_CHECK_MODULES(GNUTLS, libgnutls >= $GNUTLS_MIN_VERSION,
- [GNUTLS_FOUND=yes],
- [GNUTLS_FOUND=no])
+ [GNUTLS_FOUND=yes],
+ [GNUTLS_FOUND=no])
fi
fi
+dnl Priority 4: Guess using a list of folders.
+if test "z$GNUTLS_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then
+ AC_MSG_CHECKING(for libgnutls library installation in the typical folders)
+ if test "z$GNUTLS_INCLUDE_PATH" = "z" ; then
+ AX_FIND_FOLDER(GNUTLS_INCLUDE_PATH, $GNUTLS_INCLUDE_MARKER, $GNUTLS_INCLUDE_DIR)
+ fi
+ if test "z$GNUTLS_LIB_PATH" = "z" ; then
+ AX_FIND_FOLDER(GNUTLS_LIB_PATH, $GNUTLS_LIB_MARKER, $GNUTLS_LIB_DIR)
+ fi
+ if test "z$GNUTLS_INCLUDE_PATH" != "z" -a "z$GNUTLS_LIB_PATH" != "z" ; then
+ GNUTLS_FOUND="yes"
+ AC_MSG_RESULT([yes ("-I$GNUTLS_INCLUDE_PATH -L$GNUTLS_LIB_PATH")])
+ else
+ AC_MSG_RESULT([not found])
+ fi
+fi
+
+dnl Priority 5: Just try to compile/link and hope for the best
if test "z$GNUTLS_FOUND" = "zno" ; then
- SAVE_CFLAGS="$CFLAGS"
- SAVE_LDFLAGS="$LDFLAGS"
- if test "z$with_gnutls" != "z" -a "z$with_gnutls" != "zno" ; then
- GNUTLS_CFLAGS="-I$with_gnutls/include"
- GNUTLS_LIBS="-L$with_gnutls/lib -lgnutls"
- CFLAGS="$GNUTLS_CFLAGS $CFLAGS"
- LDFLAGS="$GNUTLS_LIBS $LDFLAGS"
- fi
- AC_CHECK_HEADERS([gnutls/gnutls.h],[
- AC_CHECK_LIB([gnutls], [gnutls_check_version], [ GNUTLS_FOUND=yes ])
- ], [], [AC_INCLUDES_DEFAULT])
- if test "z$with_gnutls" != "z" -a "z$with_gnutls" != "zno" -a "z$GNUTLS_FOUND" != "zyes" ; then
- AC_MSG_ERROR([can't find usable libgnutls at specified location "$with_gnutls"])
- fi
- CFLAGS="$SAVE_CFLAGS"
- LDFLAGS="$SAVE_LDFLAGS"
-fi
-
-AC_MSG_CHECKING(for gnutls libraries >= $GNUTLS_MIN_VERSION)
-if test "z$GNUTLS_FOUND" = "zyes" ; then
+ AC_MSG_CHECKING(for gnutls library installation)
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $GCRYPT_CFLAGS $GNUTLS_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $GNUTLS_LIBS $GCRYPT_LIBS $GNUTLS_LIBS_LIST"
+ AC_LINK_IFELSE([
+ AC_LANG_PROGRAM([[
+ #include <gnutls/gnutls.h>
+ ]],[[
+ int main () { gnutls_global_init(); return(0); }
+ ]])
+ ],[
+ GNUTLS_FOUND=yes
+ GNUTLS_LIBS="$GNUTLS_LIBS $GNUTLS_LIBS_LIST"
+ AC_MSG_RESULT([yes])
+ ],[
+ GNUTLS_FOUND=no
+ AC_MSG_RESULT([not found])
+ ])
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
+fi
+
+dnl Set CFLAGS/LIBS flags
+if test "z$GNUTLS_FOUND" = "zyes" ; then
+ dnl Set flags if INCLUDE_PATH or LIB_PATH are set (do NOT overwrite CFLAGS/LIBS!)
+ if test "z$GNUTLS_INCLUDE_PATH" != "z" ; then
+ GNUTLS_CFLAGS="$GNUTLS_CFLAGS -I$GNUTLS_INCLUDE_PATH"
+ fi
+ if test "z$GNUTLS_LIB_PATH" != "z" ; then
+ if test "z$with_gnu_ld" = "zyes" ; then
+ GNUTLS_LIBS="$GNUTLS_LIBS -Wl,-rpath-link -Wl,$GNUTLS_LIB_PATH"
+ fi
+ GNUTLS_LIBS="$GNUTLS_LIBS -L$GNUTLS_LIB_PATH $GNUTLS_LIBS_LIST"
+ fi
+fi
+
+dnl Verify the version
+AC_MSG_CHECKING(for libgnutls library >= $GNUTLS_MIN_VERSION)
+if test "z$GNUTLS_FOUND" = "zyes" ; then
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $GNUTLS_CFLAGS"
+ dnl gnutls uses hex digits for version number
+ minvers=`echo $GNUTLS_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 256 + $2) * 256 + $3;}'`
+ AC_EGREP_CPP(greater-than-minvers, [
+ #include <gnutls/gnutls.h>
+ #if GNUTLS_VERSION_NUMBER >= $minvers
+ greater-than-minvers
+ #endif
+ ],[
+ GNUTLS_FOUND=yes
+ ],[
+ GNUTLS_FOUND=no
+ ])
+ CPPFLAGS=$OLD_CPPFLAGS
+fi
+AC_MSG_RESULT([$GNUTLS_FOUND])
+
+dnl Check that we have found gcrypt
+if test "z$GNUTLS_FOUND" = "zyes" -a "z$GCRYPT_FOUND" != "zyes" ; then
+ GNUTLS_FOUND="no"
+ AC_MSG_RESULT([xmlsec-gnutls library requires xmlsec-gcrypt library which is disabled or missing, ignoring libgnutls library we have found])
+fi
+
+dnl Finally set all the flags
+if test "z$GNUTLS_FOUND" = "zyes" ; then
XMLSEC_NO_GNUTLS="0"
GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DXMLSEC_CRYPTO_GNUTLS=1"
XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST gnutls"
-
- dnl xmlsec-gnutls is using xmlsec-gcrypt
- if test "z$GCRYPT_FOUND" != "zyes" ; then
- AC_MSG_ERROR(xmlsec-gnutls library requires xmlsec-gcrypt library which is disabled or missing)
- fi
- AC_MSG_RESULT(yes)
else
XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST gnutls"
- AC_MSG_RESULT(no)
fi
AM_CONDITIONAL(XMLSEC_NO_GNUTLS, test "z$XMLSEC_NO_GNUTLS" = "z1")
@@ -953,50 +1505,76 @@ AC_SUBST(GNUTLS_MIN_VERSION)
dnl ==========================================================================
dnl See if we can find MSCrypto
dnl ==========================================================================
-XMLSEC_NO_MSCRYPTO="1"
-MSCRYPTO_CFLAGS=""
-MSCRYPTO_LIBS=""
MSCRYPTO_CRYPTO_LIB="$XMLSEC_PACKAGE-mscrypto"
-MSCRYPTO_ENABLE='none'
+case $host in
+*-w64-mingw*)
+ MSCRYPTO_XMLSEC_DEFINES=
+ MSCRYPTO_LIBS_LIST="-lcrypt32"
+ ;;
+*-*-mingw*)
+ dnl use own def-file and header as mingw.org crypt32
+ dnl is limited (library and header)
+ MSCRYPTO_XMLSEC_DEFINES="-DXMLSEC_CUSTOM_CRYPT32=1"
+ MSCRYPTO_LIBS_LIST="-Wl,$(srcdir)/mingw-crypt32.def"
+ ;;
+*)
+ MSCRYPTO_XMLSEC_DEFINES=
+ MSCRYPTO_LIBS_LIST="-lcrypt32"
+ ;;
+esac
+
+XMLSEC_NO_MSCRYPTO="1"
+MSCRYPTO_FOUND="no"
AC_ARG_ENABLE(mscrypto,
- [ --enable-mscrypto enable mscrypto (no)],
- [MSCRYPTO_ENABLE=$enableval])
-if test "z$MSCRYPTO_ENABLE" != "zyes" ; then
- AC_MSG_CHECKING(for mscrypto libraries)
- AC_MSG_RESULT([$MSCRYPTO_ENABLE])
-else
-dnl cannot detect __stdcall functions
-dnl AC_CHECK_LIB(crypt32, CertOpenStore, ....
- LIBS_SAVE="$LIBS"
- LIBS="$LIBS -lcrypt32"
- AC_MSG_CHECKING(for mscrypto libraries)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([
- #include <windows.h>
- #include <wincrypt.h>],[
- int main () { CertOpenStore(0,0,0,0,0);; return(0); }
- ])],
- [],
- [MSCRYPTO_ENABLE="no"])
- AC_MSG_RESULT([$MSCRYPTO_ENABLE])
- LIBS="$LIBS_SAVE"
-fi
-
-if test "z$MSCRYPTO_ENABLE" = "zyes" ; then
- XMLSEC_NO_MSCRYPTO="0"
+ [ --enable-mscrypto enable mscrypto (no)])
- MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1"
- case $host in
- *-w64-mingw*)
- MSCRYPTO_LIBS="-lcrypt32";;
- *-*-mingw*)
- dnl use own def-file and header as mingw.org crypt32
- dnl is limited (library and header)
- XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_CUSTOM_CRYPT32=1"
- MSCRYPTO_LIBS='-Wl,$(srcdir)/mingw-crypt32.def';;
- *)
- MSCRYPTO_LIBS="-lcrypt32";;
- esac
+dnl Priority 0: Check if library is not needed
+if test "z$enable_mscrypto" = "zno" ; then
+ MSCRYPTO_FOUND="disabled"
+fi
+dnl Priority 1: User sets both CFLAGS and LIBS flags
+if test "z$MSCRYPTO_FOUND" = "zno" -a "z$MSCRYPTO_CFLAGS" != "z" -a "z$MSCRYPTO_LIBS" != "z" ; then
+ MSCRYPTO_FOUND=yes
+fi
+
+dnl Priority 2: Just try to compile/link and hope for the best
+if test "z$MSCRYPTO_FOUND" = "zno" ; then
+ AC_MSG_CHECKING(for mscrypto)
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $MSCRYPTO_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $MSCRYPTO_LIBS $MSCRYPTO_LIBS_LIST"
+ AC_LINK_IFELSE([
+ AC_LANG_PROGRAM([[
+ #include <windows.h>
+ #include <wincrypt.h>
+ ]],[[
+ int main () { CertOpenStore(0,0,0,0,0);; return(0); }
+ ]])
+ ],[
+ MSCRYPTO_FOUND=yes
+ AC_MSG_RESULT([yes])
+ ],[
+ MSCRYPTO_FOUND=no
+ AC_MSG_RESULT([not found])
+ ])
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
+fi
+
+dnl Set CFLAGS/LIBS flags, do not change CFLAGS/LIBS if both are set
+if test "z$MSCRYPTO_FOUND" = "zyes" ; then
+ if test "z$MSCRYPTO_CFLAGS" = "z" -o "z$MSCRYPTO_LIBS" = "z" ; then
+ XMLSEC_DEFINES="$XMLSEC_DEFINES $MSCRYPTO_XMLSEC_DEFINES"
+ MSCRYPTO_LIBS="$MSCRYPTO_LIBS $MSCRYPTO_LIBS_LIST"
+ fi
+fi
+
+dnl Finally set all the flags
+if test "z$MSCRYPTO_FOUND" = "zyes" ; then
+ XMLSEC_NO_MSCRYPTO="0"
+ MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1"
XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST mscrypto"
else
XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST mscrypto"
@@ -1010,6 +1588,82 @@ AC_SUBST(MSCRYPTO_CRYPTO_LIB)
dnl ==========================================================================
+dnl See if we can find MSCng
+dnl ==========================================================================
+MSCNG_CRYPTO_LIB="$XMLSEC_PACKAGE-mscng"
+dnl This is tested on w64-mingw only so far.
+MSCNG_XMLSEC_DEFINES=
+MSCNG_LIBS_LIST="-lcrypt32 -lbcrypt -lncrypt"
+
+XMLSEC_NO_MSCNG="1"
+MSCNG_FOUND="no"
+AC_ARG_ENABLE(mscng,
+ [ --enable-mscng enable mscng (no)])
+
+dnl Priority 0: Check if library is not needed
+if test "z$enable_mscng" = "zno" ; then
+ MSCNG_FOUND="disabled"
+fi
+
+dnl Priority 1: User sets both CFLAGS and LIBS flags
+if test "z$MSCNG_FOUND" = "zno" -a "z$MSCNG_CFLAGS" != "z" -a "z$MSCNG_LIBS" != "z" ; then
+ MSCNG_FOUND=yes
+fi
+
+dnl Priority 2: Just try to compile/link and hope for the best
+if test "z$MSCNG_FOUND" = "zno" ; then
+ AC_MSG_CHECKING(for mscng)
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $MSCNG_CFLAGS"
+ OLD_LIBS=$LIBS
+ LIBS="$LIBS $MSCNG_LIBS $MSCNG_LIBS_LIST"
+ AC_LINK_IFELSE([
+ AC_LANG_PROGRAM([[
+ #include <windows.h>
+ #include <wincrypt.h>
+ ]],[[
+ int main () {
+ BCRYPT_ALG_HANDLE hAlg;
+ BCryptOpenAlgorithmProvider(&hAlg, BCRYPT_SHA256_ALGORITHM, NULL, 0);
+ return(0);
+ }
+ ]])
+ ],[
+ MSCNG_FOUND=yes
+ AC_MSG_RESULT([yes])
+ ],[
+ MSCNG_FOUND=no
+ AC_MSG_RESULT([not found])
+ ])
+ CPPFLAGS=$OLD_CPPFLAGS
+ LIBS=$OLD_LIBS
+fi
+
+dnl Set CFLAGS/LIBS flags, do not change CFLAGS/LIBS if both are set
+if test "z$MSCNG_FOUND" = "zyes" ; then
+ if test "z$MSCNG_CFLAGS" = "z" -o "z$MSCNG_LIBS" = "z" ; then
+ XMLSEC_DEFINES="$XMLSEC_DEFINES $MSCNG_XMLSEC_DEFINES"
+ MSCNG_LIBS="$MSCNG_LIBS $MSCNG_LIBS_LIST"
+ fi
+fi
+
+dnl Finally set all the flags
+if test "z$MSCNG_FOUND" = "zyes" ; then
+ XMLSEC_NO_MSCNG="0"
+ MSCNG_CFLAGS="$MSCNG_CFLAGS -DXMLSEC_CRYPTO_MSCNG=1"
+ XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST mscng"
+else
+ XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST mscng"
+fi
+
+AM_CONDITIONAL(XMLSEC_NO_MSCNG, [test "z$XMLSEC_NO_MSCNG" = "z1"])
+AC_SUBST(XMLSEC_NO_MSCNG)
+AC_SUBST(MSCNG_CFLAGS)
+AC_SUBST(MSCNG_LIBS)
+AC_SUBST(MSCNG_CRYPTO_LIB)
+
+
+dnl ==========================================================================
dnl Figure out the default crypt - the first crypto library wins
dnl ==========================================================================
XMLSEC_DEFAULT_CRYPTO=""
@@ -1028,6 +1682,13 @@ case "z$with_default_crypto" in
AC_MSG_ERROR('$with_default_crypto' is specified as default crypto library but it is not configured or found)
fi
;;
+ 'zmscng')
+ if test "z$XMLSEC_NO_MSCNG" != "z1" ; then
+ XMLSEC_DEFAULT_CRYPTO="mscng"
+ else
+ AC_MSG_ERROR('$with_default_crypto' is specified as default crypto library but it is not configured or found)
+ fi
+ ;;
'zopenssl')
if test "z$XMLSEC_NO_OPENSSL" != "z1" ; then
XMLSEC_DEFAULT_CRYPTO="openssl"
@@ -1060,6 +1721,8 @@ case "z$with_default_crypto" in
dnl The first crypto library wins
if test "z$XMLSEC_NO_MSCRYPTO" != "z1" ; then
XMLSEC_DEFAULT_CRYPTO="mscrypto"
+ elif test "z$XMLSEC_NO_MSCNG" != "z1" ; then
+ XMLSEC_DEFAULT_CRYPTO="mscng"
elif test "z$XMLSEC_NO_OPENSSL" != "z1" ; then
XMLSEC_DEFAULT_CRYPTO="openssl"
elif test "z$XMLSEC_NO_NSS" != "z1" ; then
@@ -1084,6 +1747,11 @@ case "$XMLSEC_DEFAULT_CRYPTO" in
XMLSEC_CRYPTO_CFLAGS="$MSCRYPTO_CFLAGS"
XMLSEC_CRYPTO_LIBS="$MSCRYPTO_LIBS"
;;
+ 'mscng')
+ XMLSEC_CRYPTO_LIB="$MSCNG_CRYPTO_LIB"
+ XMLSEC_CRYPTO_CFLAGS="$MSCNG_CFLAGS"
+ XMLSEC_CRYPTO_LIBS="$MSCNG_LIBS"
+ ;;
'openssl')
XMLSEC_CRYPTO_LIB="$OPENSSL_CRYPTO_LIB"
XMLSEC_CRYPTO_CFLAGS="$OPENSSL_CFLAGS"
@@ -1108,117 +1776,117 @@ case "$XMLSEC_DEFAULT_CRYPTO" in
AC_MSG_ERROR(The value \"$XMLSEC_DEFAULT_CRYPTO\" is not a recongnized crypto library name)
;;
esac
-AC_MSG_RESULT(yes ('$XMLSEC_DEFAULT_CRYPTO'))
+AC_MSG_RESULT([yes ("$XMLSEC_DEFAULT_CRYPTO")])
dnl ==========================================================================
dnl See do we need MD5 support
dnl ==========================================================================
-AC_MSG_CHECKING(for MD5 support)
+AC_MSG_CHECKING(for MD5 support)
AC_ARG_ENABLE(md5, [ --enable-md5 enable MD5 support (yes)])
if test "z$enable_md5" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_MD5=1"
XMLSEC_NO_MD5="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_NO_MD5="0"
- AC_MSG_RESULT(yes)
-fi
+ AC_MSG_RESULT([yes])
+fi
AM_CONDITIONAL(XMLSEC_NO_MD5, test "z$XMLSEC_NO_MD5" = "z1")
AC_SUBST(XMLSEC_NO_MD5)
dnl ==========================================================================
dnl See do we need RIPEMD-160 support
dnl ==========================================================================
-AC_MSG_CHECKING(for RIPEMD-160 support)
+AC_MSG_CHECKING(for RIPEMD-160 support)
AC_ARG_ENABLE(ripemd160, [ --enable-ripemd160 enable RIPEMD-160 support (yes)])
if test "z$enable_ripemd160" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_RIPEMD160=1"
XMLSEC_NO_RIPEMD160="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_NO_RIPEMD160="0"
- AC_MSG_RESULT(yes)
-fi
+ AC_MSG_RESULT([yes])
+fi
AM_CONDITIONAL(XMLSEC_NO_RIPEMD160, test "z$XMLSEC_NO_RIPEMD160" = "z1")
AC_SUBST(XMLSEC_NO_RIPEMD160)
dnl ==========================================================================
dnl See do we need SHA1 support
dnl ==========================================================================
-AC_MSG_CHECKING(for SHA1 support)
+AC_MSG_CHECKING(for SHA1 support)
AC_ARG_ENABLE(sha1, [ --enable-sha1 enable SHA1 support (yes)])
if test "z$enable_sha1" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA1=1"
XMLSEC_NO_SHA1="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_NO_SHA1="0"
- AC_MSG_RESULT(yes)
-fi
+ AC_MSG_RESULT([yes])
+fi
AM_CONDITIONAL(XMLSEC_NO_SHA1, test "z$XMLSEC_NO_SHA1" = "z1")
AC_SUBST(XMLSEC_NO_SHA1)
dnl ==========================================================================
dnl See do we need SHA224 support
dnl ==========================================================================
-AC_MSG_CHECKING(for SHA224 support)
+AC_MSG_CHECKING(for SHA224 support)
AC_ARG_ENABLE(sha224, [ --enable-sha224 enable SHA224 support (yes)])
if test "z$enable_sha224" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA224=1"
XMLSEC_NO_SHA224="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_NO_SHA224="0"
- AC_MSG_RESULT(yes)
-fi
+ AC_MSG_RESULT([yes])
+fi
AM_CONDITIONAL(XMLSEC_NO_SHA224, test "z$XMLSEC_NO_SHA224" = "z1")
AC_SUBST(XMLSEC_NO_SHA224)
dnl ==========================================================================
dnl See do we need SHA256 support
dnl ==========================================================================
-AC_MSG_CHECKING(for SHA256 support)
+AC_MSG_CHECKING(for SHA256 support)
AC_ARG_ENABLE(sha256, [ --enable-sha256 enable SHA256 support (yes)])
if test "z$enable_sha256" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA256=1"
XMLSEC_NO_SHA256="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_NO_SHA256="0"
- AC_MSG_RESULT(yes)
-fi
+ AC_MSG_RESULT([yes])
+fi
AM_CONDITIONAL(XMLSEC_NO_SHA256, test "z$XMLSEC_NO_SHA256" = "z1")
AC_SUBST(XMLSEC_NO_SHA256)
dnl ==========================================================================
dnl See do we need SHA384 support
dnl ==========================================================================
-AC_MSG_CHECKING(for SHA384 support)
+AC_MSG_CHECKING(for SHA384 support)
AC_ARG_ENABLE(sha384, [ --enable-sha384 enable SHA384 support (yes)])
if test "z$enable_sha384" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA384=1"
XMLSEC_NO_SHA384="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_NO_SHA384="0"
- AC_MSG_RESULT(yes)
-fi
+ AC_MSG_RESULT([yes])
+fi
AM_CONDITIONAL(XMLSEC_NO_SHA384, test "z$XMLSEC_NO_SHA384" = "z1")
AC_SUBST(XMLSEC_NO_SHA384)
dnl ==========================================================================
dnl See do we need SHA512 support
dnl ==========================================================================
-AC_MSG_CHECKING(for SHA512 support)
+AC_MSG_CHECKING(for SHA512 support)
AC_ARG_ENABLE(sha512, [ --enable-sha512 enable SHA512 support (yes)])
if test "z$enable_sha512" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA512=1"
XMLSEC_NO_SHA512="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_NO_SHA512="0"
- AC_MSG_RESULT(yes)
-fi
+ AC_MSG_RESULT([yes])
+fi
AM_CONDITIONAL(XMLSEC_NO_SHA512, test "z$XMLSEC_NO_SHA512" = "z1")
AC_SUBST(XMLSEC_NO_SHA512)
@@ -1226,96 +1894,96 @@ AC_SUBST(XMLSEC_NO_SHA512)
dnl ==========================================================================
dnl See do we need HMAC support
dnl ==========================================================================
-AC_MSG_CHECKING(for HMAC support)
+AC_MSG_CHECKING(for HMAC support)
AC_ARG_ENABLE(hmac, [ --enable-hmac enable HMAC support (yes)])
if test "z$enable_hmac" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_HMAC=1"
XMLSEC_NO_HMAC="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_NO_HMAC="0"
- AC_MSG_RESULT(yes)
-fi
+ AC_MSG_RESULT([yes])
+fi
AM_CONDITIONAL(XMLSEC_NO_HMAC, test "z$XMLSEC_NO_HMAC" = "z1")
AC_SUBST(XMLSEC_NO_HMAC)
dnl ==========================================================================
dnl See do we need DSA support
dnl ==========================================================================
-AC_MSG_CHECKING(for DSA support)
+AC_MSG_CHECKING(for DSA support)
AC_ARG_ENABLE(dsa, [ --enable-dsa enable DSA support (yes)])
if test "z$enable_dsa" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_DSA=1"
XMLSEC_NO_DSA="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_NO_DSA="0"
- AC_MSG_RESULT(yes)
-fi
+ AC_MSG_RESULT([yes])
+fi
AM_CONDITIONAL(XMLSEC_NO_DSA, test "z$XMLSEC_NO_DSA" = "z1")
AC_SUBST(XMLSEC_NO_DSA)
dnl ==========================================================================
dnl See do we need RSA support
dnl ==========================================================================
-AC_MSG_CHECKING(for RSA support)
+AC_MSG_CHECKING(for RSA support)
AC_ARG_ENABLE(rsa, [ --enable-rsa enable RSA support (yes)])
if test "z$enable_rsa" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_RSA=1"
XMLSEC_NO_RSA="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_NO_RSA="0"
- AC_MSG_RESULT(yes)
-fi
+ AC_MSG_RESULT([yes])
+fi
AM_CONDITIONAL(XMLSEC_NO_RSA, test "z$XMLSEC_NO_RSA" = "z1")
AC_SUBST(XMLSEC_NO_RSA)
dnl ==========================================================================
dnl See do we need x509 support
dnl ==========================================================================
-AC_MSG_CHECKING(for x509 support)
+AC_MSG_CHECKING(for x509 support)
AC_ARG_ENABLE(x509, [ --enable-x509 enable x509 support (yes)])
if test "z$enable_x509" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_X509=1"
XMLSEC_NO_X509="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_NO_X509="0"
- AC_MSG_RESULT(yes)
-fi
+ AC_MSG_RESULT([yes])
+fi
AM_CONDITIONAL(XMLSEC_NO_X509, test "z$XMLSEC_NO_X509" = "z1")
AC_SUBST(XMLSEC_NO_X509)
dnl ==========================================================================
dnl See do we need DES support
dnl ==========================================================================
-AC_MSG_CHECKING(for DES support)
+AC_MSG_CHECKING(for DES support)
AC_ARG_ENABLE(des, [ --enable-des enable DES support (yes)])
if test "z$enable_des" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_DES=1"
XMLSEC_NO_DES="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_NO_DES="0"
- AC_MSG_RESULT(yes)
-fi
+ AC_MSG_RESULT([yes])
+fi
AM_CONDITIONAL(XMLSEC_NO_DES, test "z$XMLSEC_NO_DES" = "z1")
AC_SUBST(XMLSEC_NO_DES)
dnl ==========================================================================
dnl See do we need AES support
dnl ==========================================================================
-AC_MSG_CHECKING(for AES support)
+AC_MSG_CHECKING(for AES support)
AC_ARG_ENABLE(aes, [ --enable-aes enable AES support])
if test "z$enable_aes" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_AES=1"
XMLSEC_NO_AES="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_NO_AES="0"
- AC_MSG_RESULT(yes)
-fi
+ AC_MSG_RESULT([yes])
+fi
AM_CONDITIONAL(XMLSEC_NO_AES, test "z$XMLSEC_NO_AES" = "z1")
AC_SUBST(XMLSEC_NO_AES)
@@ -1327,10 +1995,10 @@ AC_ARG_ENABLE(gost, [ --enable-gost enable GOST support (no)])
if test "z$enable_gost" != "zyes" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_GOST=1"
XMLSEC_NO_GOST="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_NO_GOST="0"
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([yes])
fi
AM_CONDITIONAL(XMLSEC_NO_GOST, test "z$XMLSEC_NO_GOST" = "z1")
AC_SUBST(XMLSEC_NO_GOST)
@@ -1344,10 +2012,10 @@ AC_ARG_ENABLE(gost, [ --enable-gost2012 enable EXPERMIENTAL GOST2012 su
if test "z$enable_gost2012" != "zyes" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_GOST2012=1"
XMLSEC_NO_GOST2012="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_NO_GOST2012="0"
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([yes])
fi
AM_CONDITIONAL(XMLSEC_NO_GOST2012, test "z$XMLSEC_NO_GOST2012" = "z1")
AC_SUBST(XMLSEC_NO_GOST2012)
@@ -1356,32 +2024,32 @@ AC_SUBST(XMLSEC_NO_GOST2012)
dnl ==========================================================================
dnl See do we need XMLDSig support
dnl ==========================================================================
-AC_MSG_CHECKING(for XMLDSig support)
+AC_MSG_CHECKING(for XMLDSig support)
AC_ARG_ENABLE(xmldsig, [ --enable-xmldsig enable XMLDSig support (yes)])
if test "z$enable_xmldsig" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XMLDSIG=1"
XMLSEC_NO_XMLDSIG="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_NO_XMLDSIG="0"
- AC_MSG_RESULT(yes)
-fi
+ AC_MSG_RESULT([yes])
+fi
AM_CONDITIONAL(XMLSEC_NO_XMLDSIG, test "z$XMLSEC_NO_XMLDSIG" = "z1")
AC_SUBST(XMLSEC_NO_XMLDSIG)
dnl ==========================================================================
dnl See do we need XMLEnc support
dnl ==========================================================================
-AC_MSG_CHECKING(for XMLEnc support)
+AC_MSG_CHECKING(for XMLEnc support)
AC_ARG_ENABLE(xmlenc, [ --enable-xmlenc enable XMLEnc support (yes)])
if test "z$enable_xmlenc" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XMLENC=1"
XMLSEC_NO_XMLENC="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_NO_XMLENC="0"
- AC_MSG_RESULT(yes)
-fi
+ AC_MSG_RESULT([yes])
+fi
AM_CONDITIONAL(XMLSEC_NO_XMLENC, test "z$XMLSEC_NO_XMLENC" = "z1")
AC_SUBST(XMLSEC_NO_XMLENC)
@@ -1392,11 +2060,11 @@ AC_MSG_CHECKING(for soap support)
AC_ARG_ENABLE(soap, [ --enable-soap enable soap support (no)])
if test "z$enable_soap" = "zyes" ; then
XMLSEC_ENABLE_SOAP="1"
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([yes])
else
XMLSEC_ENABLE_SOAP="0"
- AC_MSG_RESULT(no)
-fi
+ AC_MSG_RESULT([disabled])
+fi
AM_CONDITIONAL(XMLSEC_ENABLE_SOAP, test "z$XMLSEC_ENABLE_SOAP" = "z1")
dnl ==========================================================================
@@ -1406,10 +2074,10 @@ AC_MSG_CHECKING(for docs)
AC_ARG_ENABLE(docs, [ --enable-docs enable documentation (yes)])
if test "z$enable_docs" = "zno" ; then
XMLSEC_DOCS="0"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_DOCS="1"
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([yes])
fi
AM_CONDITIONAL(XMLSEC_DOCS, test "z$XMLSEC_DOCS" = "z1")
AC_SUBST(XMLSEC_DOCS)
@@ -1421,10 +2089,10 @@ AC_MSG_CHECKING(for apps)
AC_ARG_ENABLE(apps, [ --enable-apps enable applications (yes)])
if test "z$enable_apps" = "zno" ; then
XMLSEC_APPS="0"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
XMLSEC_APPS="1"
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([yes])
fi
AM_CONDITIONAL(XMLSEC_APPS, test "z$XMLSEC_APPS" = "z1")
AC_SUBST(XMLSEC_APPS)
@@ -1433,16 +2101,16 @@ dnl ==========================================================================
dnl Static linking (implies enable_crypto_dl="no")
dnl ==========================================================================
XMLSEC_STATIC_BINARIES=""
-AC_MSG_CHECKING(for static linking)
+AC_MSG_CHECKING(for static linking)
AC_ARG_ENABLE(static_linking, [ --enable-static-linking enable static linking (no)])
if test "z$enable_static_linking" = "zyes" ; then
XMLSEC_STATIC_BINARIES="-static"
XMLSEC_APP_DEFINES="$XMLSEC_APP_DEFINES -DXMLSEC_STATIC=1"
enable_crypto_dl="no"
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT(no)
-fi
+ AC_MSG_RESULT([disabled])
+fi
AC_SUBST(XMLSEC_STATIC_BINARIES)
dnl ==========================================================================
@@ -1450,32 +2118,33 @@ dnl check if we need dynamic loading support
dnl ==========================================================================
XMLSEC_DL_INCLUDES=""
XMLSEC_DL_LIBS=""
-AC_MSG_CHECKING(for xmlsec-crypto dynamic loading support)
AC_ARG_ENABLE(crypto_dl, [ --enable-crypto-dl enable dynamic loading support for xmlsec-crypto libraries (yes)])
if test "z$enable_crypto_dl" = "zno" ; then
+ AC_MSG_CHECKING(for xmlsec-crypto dynamic loading support)
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_CRYPTO_DYNAMIC_LOADING=1"
XMLSEC_NO_CRYPTO_DYNAMIC_LOADING="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
- AC_CHECK_HEADER([ltdl.h],
- [
- XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_DL_LIBLTDL=1"
- AC_CHECK_LIB(
- [ltdl],
- [lt_dlopenext],
- [LIBLTDL=-lltdl],
- [LIBLTDL=]
- )],
- [LIBLTDL=]
- )
+ AC_CHECK_HEADER([ltdl.h], [
+ XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_DL_LIBLTDL=1"
+ AC_CHECK_LIB(
+ [ltdl],
+ [lt_dlopenext],
+ [LIBLTDL=-lltdl],
+ [LIBLTDL=]
+ )
+ ], [
+ LIBLTDL=
+ ])
+ AC_MSG_CHECKING(for xmlsec-crypto dynamic loading support)
if test "z$LIBLTDL" != "z" ; then
- XMLSEC_DL_INCLUDES="$INCLTDL"
- XMLSEC_DL_LIBS="$LIBLTDL"
- XMLSEC_NO_CRYPTO_DYNAMIC_LOADING="0"
- AC_MSG_RESULT(yes)
+ XMLSEC_DL_INCLUDES="$INCLTDL"
+ XMLSEC_DL_LIBS="$LIBLTDL"
+ XMLSEC_NO_CRYPTO_DYNAMIC_LOADING="0"
+ AC_MSG_RESULT([yes])
else
- AC_MSG_ERROR([libltdl is required for xmlsec-crypto dynamic loading])
+ AC_MSG_ERROR([libltdl is required for xmlsec-crypto dynamic loading])
fi
fi
AM_CONDITIONAL(XMLSEC_NO_CRYPTO_DYNAMIC_LOADING, test "z$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING" = "z1")
@@ -1486,30 +2155,30 @@ AC_SUBST(XMLSEC_DL_LIBS)
dnl ==========================================================================
dnl check if we need dynamic loading in the xmlsec apps
dnl ==========================================================================
-AC_MSG_CHECKING(for xmlsec-crypto dynamic loading support in command line tool)
+AC_MSG_CHECKING(for xmlsec-crypto dynamic loading support in command line tool)
AC_ARG_ENABLE(apps_crypto_dl, [ --enable-apps-crypto-dl enable dynamic loading support for xmlsec-crypto libraries in xmlsec command line tool (yes)])
if test "z$enable_apps_crypto_dl" = "z" ; then
enable_apps_crypto_dl="$enable_crypto_dl"
fi
if test "z$enable_apps_crypto_dl" = "zno" ; then
XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING="1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
elif test "z$enable_crypto_dl" = "zno" ; then
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
AC_MSG_ERROR(xmlsec-crypto libraries dynamic loading support in xmlsec command line tool is requested but no dynamic loading in xmlsec itself is disabled)
else
XMLSEC_APP_DEFINES="$XMLSEC_APP_DEFINES -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1"
XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING="0"
- AC_MSG_RESULT(yes)
-fi
-AM_CONDITIONAL(XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING,
+ AC_MSG_RESULT([yes])
+fi
+AM_CONDITIONAL(XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING,
test "z$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING" = "z1")
AC_SUBST(XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING)
dnl ==========================================================================
dnl Where do we want to install docs
dnl ==========================================================================
-AC_MSG_CHECKING(for docs folder)
+AC_MSG_CHECKING(for docs folder)
AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ])
if test "z$with_html_dir" != "z" ; then
XMLSEC_DOCDIR=$with_html_dir
@@ -1517,68 +2186,80 @@ else
XMLSEC_DOCDIR='$(datadir)/doc/xmlsec1'
fi
-AC_MSG_RESULT($XMLSEC_DOCDIR)
+AC_MSG_RESULT([$XMLSEC_DOCDIR])
AC_SUBST(XMLSEC_DOCDIR)
dnl ==========================================================================
-dnl See do we need Simple Keys Manager
+dnl See do we need Simple Keys Manager
dnl ==========================================================================
-AC_MSG_CHECKING(for Simple Keys Manager testing)
+AC_MSG_CHECKING(for Simple Keys Manager testing)
AC_ARG_ENABLE(skm, [ --enable-skm enable Simple Keys Manager testing (yes)])
if test "z$enable_skm" = "zno" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SKM_TEST=1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([yes])
fi
dnl ==========================================================================
dnl See do we need templates tests
dnl ==========================================================================
-AC_MSG_CHECKING(for templates testing)
+AC_MSG_CHECKING(for templates testing)
AC_ARG_ENABLE(tmpl_tests, [ --enable-tmpl-tests enable templates testing in xmlsec utility (yes)])
if test "z$enable_tmpl_tests" = "zyes" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_TMPL_TEST=1"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
else
- AC_MSG_RESULT(yes)
-fi
+ AC_MSG_RESULT([yes])
+fi
dnl ==========================================================================
-dnl Debug
+dnl Debug
dnl ==========================================================================
AC_MSG_CHECKING(for debugging)
AC_ARG_ENABLE(debugging, [ --enable-debugging enable debugging compilation flags (no)])
if test "z$enable_debugging" = "zyes" ; then
CFLAGS="$CFLAGS -g"
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT(no)
-fi
+ AC_MSG_RESULT([disabled])
+fi
dnl ==========================================================================
-dnl Profiling
+dnl Warnings as errors
dnl ==========================================================================
-AC_MSG_CHECKING(for profiling)
+AC_MSG_CHECKING(for warnings as errors)
+AC_ARG_ENABLE(werror, [ --enable-werror handle warnings as errors (no)])
+if test "z$enable_werror" = "zyes" ; then
+ CFLAGS="$CFLAGS -Werror"
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([disabled])
+fi
+
+dnl ==========================================================================
+dnl Profiling
+dnl ==========================================================================
+AC_MSG_CHECKING(for profiling)
AC_ARG_ENABLE(profiling, [ --enable-profiling enable profiling compilation flags (no)])
if test "z$enable_profiling" = "zyes" ; then
CFLAGS="$CFLAGS -pg"
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT(no)
-fi
+ AC_MSG_RESULT([disabled])
+fi
dnl ==========================================================================
dnl Pedantic compilation
dnl ==========================================================================
-AC_MSG_CHECKING(for pedantic)
+AC_MSG_CHECKING(for pedantic)
AC_ARG_ENABLE(pedantic, [ --enable-pedantic enable pedantic compilation flags (no)])
if test "z$enable_pedantic" = "zyes" ; then
dnl CFLAGS="$CFLAGS -pedantic -Wall -std=c99 -W -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wredundant-decls"
CFLAGS="$CFLAGS -O -pedantic -Wall -std=c99 -fno-inline -W -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wredundant-decls"
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([disabled])
fi
dnl ==========================================================================
@@ -1620,6 +2301,12 @@ dnl XMLSEC_MSCRYPTO_LIBS="-L${libdir} -l$MSCRYPTO_CRYPTO_LIB $XMLSEC_CORE_LIBS $
dnl AC_SUBST(XMLSEC_MSCRYPTO_CFLAGS)
dnl AC_SUBST(XMLSEC_MSCRYPTO_LIBS)
+dnl No we will not generate pkg-config file for mscng.
+dnl XMLSEC_MSCNG_CFLAGS="$XMLSEC_CORE_CFLAGS $MSCNG_CFLAGS"
+dnl XMLSEC_MSCNG_LIBS="-L${libdir} -l$MSCNG_CRYPTO_LIB $XMLSEC_CORE_LIBS $MSCNG_LIBS";;
+dnl AC_SUBST(XMLSEC_MSCNG_CFLAGS)
+dnl AC_SUBST(XMLSEC_MSCNG_LIBS)
+
XMLSEC_CFLAGS="$XMLSEC_CORE_CFLAGS $LIBXML_CFLAGS $LIBXSLT_CFLAGS $XMLSEC_CRYPTO_CFLAGS"
XMLSEC_LIBS="-L${libdir} -l$XMLSEC_CRYPTO_LIB $XMLSEC_CORE_LIBS $LIBXML_LIBS $LIBXSLT_LIBS $XMLSEC_CRYPTO_LIBS"
AC_SUBST(XMLSEC_CFLAGS)
@@ -1642,8 +2329,9 @@ AC_SUBST(XMLSEC_CRYPTO_LIBS)
XMLSEC_CRYPTO_PC_FILES_LIST=""
for i in $XMLSEC_CRYPTO_LIST ; do
- dnl skip pkg-config file for mscrypto
+ dnl skip pkg-config file for mscrypto/mscng
test x$i = xmscrypto && continue
+ test x$i = xmscng && continue
XMLSEC_CRYPTO_PC_FILES_LIST="$XMLSEC_CRYPTO_PC_FILES_LIST $XMLSEC_PACKAGE-$i.pc"
done
AC_SUBST(XMLSEC_CRYPTO_PC_FILES_LIST)
@@ -1671,6 +2359,10 @@ if test "z$XMLSEC_NO_MSCRYPTO" != "z1" ; then
AC_CONFIG_FILES([include/xmlsec/mscrypto/Makefile src/mscrypto/Makefile])
fi
+if test "z$XMLSEC_NO_MSCNG" != "z1" ; then
+AC_CONFIG_FILES([include/xmlsec/mscng/Makefile src/mscng/Makefile])
+fi
+
if test "z$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING" = "z1" ; then
(rm -f xmlsec1.pc && $LN_S xmlsec1-$XMLSEC_DEFAULT_CRYPTO.pc xmlsec1.pc)
else
diff --git a/depcomp b/depcomp
index fc98710..b39f98f 100755
--- a/depcomp
+++ b/depcomp
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -786,6 +786,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 32bf780..e1dd76c 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -9,6 +9,7 @@ EXTRA_DIST=\
$(builddir)/*.html \
$(builddir)/*.ico \
$(builddir)/xmlsec.xsl \
+ $(builddir)/xmlsec-ga.xsl \
$(NULL)
XMLSEC1_MAN=$(top_builddir)/man/xmlsec1.1
@@ -70,6 +71,19 @@ docs-format:
sed 's/\xA0/ /g' $$i > $$i.tmp ; \
mv $$i.tmp $$i ; \
done)
+docs-format-ga:
+ @(echo "Formatting html documents to add Google Analytics"; \
+ for i in `find $(builddir) -name "*.html" -print`; \
+ do \
+ echo "Processing $$i"; \
+ $(XSLTPROC) --html --output $$i.tmp $(srcdir)/xmlsec-ga.xsl $$i; \
+ if [ $$? != 0 ]; \
+ then \
+ echo "ERROR: processing file $$i"; \
+ exit 1; \
+ fi; \
+ mv $$i.tmp $$i; \
+ done)
else
# do nothing
docs-format:
diff --git a/docs/Makefile.in b/docs/Makefile.in
index efe5df7..fc0b106 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -209,6 +209,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GCRYPT_CFLAGS = @GCRYPT_CFLAGS@
+GCRYPT_CONFIG_PATH = @GCRYPT_CONFIG_PATH@
GCRYPT_CRYPTO_LIB = @GCRYPT_CRYPTO_LIB@
GCRYPT_LIBS = @GCRYPT_LIBS@
GCRYPT_MIN_VERSION = @GCRYPT_MIN_VERSION@
@@ -219,7 +220,6 @@ GNUTLS_MIN_VERSION = @GNUTLS_MIN_VERSION@
GREP = @GREP@
GTKDOC_MKDB = @GTKDOC_MKDB@
GTKDOC_MKHTML = @GTKDOC_MKHTML@
-GTKDOC_MKTMPL = @GTKDOC_MKTMPL@
GTKDOC_SCAN = @GTKDOC_SCAN@
HELP2MAN = @HELP2MAN@
INSTALL = @INSTALL@
@@ -234,10 +234,12 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBXML_CFLAGS = @LIBXML_CFLAGS@
LIBXML_CONFIG = @LIBXML_CONFIG@
+LIBXML_CONFIG_PATH = @LIBXML_CONFIG_PATH@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_MIN_VERSION = @LIBXML_MIN_VERSION@
LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
LIBXSLT_CONFIG = @LIBXSLT_CONFIG@
+LIBXSLT_CONFIG_PATH = @LIBXSLT_CONFIG_PATH@
LIBXSLT_LIBS = @LIBXSLT_LIBS@
LIBXSLT_MIN_VERSION = @LIBXSLT_MIN_VERSION@
LIBXSLT_PC_FILE_COND = @LIBXSLT_PC_FILE_COND@
@@ -251,12 +253,17 @@ MAN2HTML = @MAN2HTML@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCNG_CFLAGS = @MSCNG_CFLAGS@
+MSCNG_CRYPTO_LIB = @MSCNG_CRYPTO_LIB@
+MSCNG_LIBS = @MSCNG_LIBS@
MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
MV = @MV@
NM = @NM@
NMEDIT = @NMEDIT@
+NSPR_CFLAGS = @NSPR_CFLAGS@
+NSPR_LIBS = @NSPR_LIBS@
NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
NSPR_PACKAGE = @NSPR_PACKAGE@
NSS_CFLAGS = @NSS_CFLAGS@
@@ -329,6 +336,7 @@ XMLSEC_NO_GOST2012 = @XMLSEC_NO_GOST2012@
XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
+XMLSEC_NO_MSCNG = @XMLSEC_NO_MSCNG@
XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
XMLSEC_NO_OPENSSL = @XMLSEC_NO_OPENSSL@
@@ -416,6 +424,7 @@ EXTRA_DIST = \
$(builddir)/*.html \
$(builddir)/*.ico \
$(builddir)/xmlsec.xsl \
+ $(builddir)/xmlsec-ga.xsl \
$(NULL)
XMLSEC1_MAN = $(top_builddir)/man/xmlsec1.1
@@ -785,6 +794,19 @@ docs-copy:
@HAS_XSLTPROC_TRUE@ sed 's/\xA0/ /g' $$i > $$i.tmp ; \
@HAS_XSLTPROC_TRUE@ mv $$i.tmp $$i ; \
@HAS_XSLTPROC_TRUE@ done)
+@HAS_XSLTPROC_TRUE@docs-format-ga:
+@HAS_XSLTPROC_TRUE@ @(echo "Formatting html documents to add Google Analytics"; \
+@HAS_XSLTPROC_TRUE@ for i in `find $(builddir) -name "*.html" -print`; \
+@HAS_XSLTPROC_TRUE@ do \
+@HAS_XSLTPROC_TRUE@ echo "Processing $$i"; \
+@HAS_XSLTPROC_TRUE@ $(XSLTPROC) --html --output $$i.tmp $(srcdir)/xmlsec-ga.xsl $$i; \
+@HAS_XSLTPROC_TRUE@ if [ $$? != 0 ]; \
+@HAS_XSLTPROC_TRUE@ then \
+@HAS_XSLTPROC_TRUE@ echo "ERROR: processing file $$i"; \
+@HAS_XSLTPROC_TRUE@ exit 1; \
+@HAS_XSLTPROC_TRUE@ fi; \
+@HAS_XSLTPROC_TRUE@ mv $$i.tmp $$i; \
+@HAS_XSLTPROC_TRUE@ done)
# do nothing
@HAS_XSLTPROC_FALSE@docs-format:
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index 41d1aa7..af17ee5 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -11,17 +11,14 @@ INCLUDE_DIR2=$(top_builddir)/include
SCAN_DIR=$(builddir)
SGML_DIR=$(builddir)/sgml.tmp
-XML_DIR=$(builddir)/xml.tmp
EXAMPLES_DIR=$(SGML_DIR)/examples
SOURCE_CODE_DIR=$(builddir)/code
+GTKDOC_MKDB_OUTPUT_DIR=$(builddir)/xml
# We need to copy some files to make gkdoc happy that
# everything is in one folder
-TMPL_DIR=$(builddir)/tmpl
-TMPL_SRC_DIR=$(srcdir)/tmpl
-
-MAIN_SGML_FILE=$(SGML_DIR)/xmlsec-main.sgml
+MAIN_SGML_FILE=$(SGML_DIR)/xmlsec.sgml
MAIN_SGML_SRC_FILE=$(srcdir)/src/xmlsec.sgml
SGML_CHAPTERS_DIR=$(SGML_DIR)/chapters
@@ -29,7 +26,6 @@ SGML_CHAPTERS_SRC_DIR=$(srcdir)/src/chapters
EXTRA_DIST = \
- $(TMPL_DIR) \
$(srcdir)/src \
$(srcdir)/images \
$(srcdir)/style.css \
@@ -43,6 +39,15 @@ SOURCE_FILES_TO_COPY = \
$(srcdir)/*.png \
$(NULL)
+CRYPTO_LIBS_LIST = \
+ openssl \
+ nss \
+ gnutls \
+ gcrypt \
+ mscrypto \
+ mscng \
+ $(NULL)
+
#
# We need to pre-process original source files
# because gtkdoc does not understand some C features
@@ -83,7 +88,7 @@ docs:
endif
html-cleanup: html
- ( echo "Cleaning up result files"; \
+ @( echo "Cleaning up result files"; \
$(PERL) $(REMOVE_GTKDOCLINK) `find . -name "*.html" -print` \
)
@@ -127,103 +132,46 @@ sgml: sgml-base
mv -f $$i.tmp $$i; \
done);
-sgml-base: templates $(SGML_DIR)/.sentinel
- $(GTKDOC_MKDB) --module=xmlsec \
+# gtkdoc-mkdb doesn't support --output-dir thus we have to "hack" it a litle bit
+sgml-base: scan $(SGML_DIR)/.sentinel
+ @( \
+ echo "Create DocBook files for xmlsec-core" ; \
+ rm -rf $(GTKDOC_MKDB_OUTPUT_DIR) $(SGML_DIR)/base ; \
+ $(GTKDOC_MKDB) --module=xmlsec \
--xml-mode \
--main-sgml-file=$(SGML_DIR)/xmlsec-base.sgml \
- --output-dir=$(SGML_DIR)/ \
- --tmpl-dir=$(TMPL_DIR)/base \
--source-dir=$(SOURCE_CODE_DIR)/src/base \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/base
- $(GTKDOC_MKDB) --module=xmlsec-openssl \
- --xml-mode \
- --main-sgml-file=$(SGML_DIR)/xmlsec-openssl.sgml \
- --tmpl-dir=$(TMPL_DIR)/openssl \
- --output-dir=$(SGML_DIR)/openssl \
- --source-dir=$(SOURCE_CODE_DIR)/src/openssl \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/openssl
- $(GTKDOC_MKDB) --module=xmlsec-gnutls \
- --xml-mode \
- --main-sgml-file=$(SGML_DIR)/xmlsec-gnutls.sgml \
- --tmpl-dir=$(TMPL_DIR)/gnutls \
- --output-dir=$(SGML_DIR)/gnutls \
- --source-dir=$(SOURCE_CODE_DIR)/src/gnutls \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/gnutls
- $(GTKDOC_MKDB) --module=xmlsec-gcrypt \
+ --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/base ; \
+ mv $(GTKDOC_MKDB_OUTPUT_DIR) $(SGML_DIR)/base ; \
+ );
+ @(for i in $(CRYPTO_LIBS_LIST) ; do \
+ echo "Create DocBook files for xmlsec-$$i" ; \
+ rm -rf $(GTKDOC_MKDB_OUTPUT_DIR) $(SGML_DIR)/$$i ; \
+ $(GTKDOC_MKDB) --module=xmlsec-$$i \
--xml-mode \
- --main-sgml-file=$(SGML_DIR)/xmlsec-gcrypt.sgml \
- --tmpl-dir=$(TMPL_DIR)/gcrypt \
- --output-dir=$(SGML_DIR)/gcrypt \
- --source-dir=$(SOURCE_CODE_DIR)/src/gcrypt \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/gcrypt
- $(GTKDOC_MKDB) --module=xmlsec-nss \
- --xml-mode \
- --main-sgml-file=$(SGML_DIR)/xmlsec-nss.sgml \
- --tmpl-dir=$(TMPL_DIR)/nss \
- --output-dir=$(SGML_DIR)/nss \
- --source-dir=$(SOURCE_CODE_DIR)/src/nss \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/nss
- $(GTKDOC_MKDB) --module=xmlsec-mscrypto \
- --xml-mode \
- --main-sgml-file=$(SGML_DIR)/xmlsec-mscrypto.sgml \
- --tmpl-dir=$(TMPL_DIR)/mscrypto \
- --output-dir=$(SGML_DIR)/mscrypto \
- --source-dir=$(SOURCE_CODE_DIR)/src/mscrypto \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/mscrypto
-
-templates: scan templates-copy
- $(GTKDOC_MKTMPL) --module=xmlsec \
- --output-dir=$(TMPL_DIR)/base
- $(GTKDOC_MKTMPL) --module=xmlsec-openssl \
- --output-dir=$(TMPL_DIR)/openssl
- $(GTKDOC_MKTMPL) --module=xmlsec-gnutls \
- --output-dir=$(TMPL_DIR)/gnutls
- $(GTKDOC_MKTMPL) --module=xmlsec-gcrypt \
- --output-dir=$(TMPL_DIR)/gcrypt
- $(GTKDOC_MKTMPL) --module=xmlsec-nss \
- --output-dir=$(TMPL_DIR)/nss
- $(GTKDOC_MKTMPL) --module=xmlsec-mscrypto \
- --output-dir=$(TMPL_DIR)/mscrypto
-
-# make sure to run chmod since we will update templates
-templates-copy: $(TMPL_SRC_DIR) $(TMPL_DIR)/.sentinel
- @echo "Copying original template files into '$(TMPL_DIR)' ..."
- ( if [ z"$(TMPL_DIR)" != z"$(TMPL_SRC_DIR)" ] ; then \
- $(CP) -ru $(TMPL_SRC_DIR)/* $(TMPL_DIR)/ ; \
- fi ; )
- chmod -R u+w $(TMPL_DIR)
+ --main-sgml-file=$(SGML_DIR)/xmlsec-$$i.sgml \
+ --source-dir=$(SOURCE_CODE_DIR)/src/$$i \
+ --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/$$i ; \
+ mv $(GTKDOC_MKDB_OUTPUT_DIR) $(SGML_DIR)/$$i ; \
+ done);
scan: SOURCE_CODEs example_sources
- $(GTKDOC_SCAN) --module=xmlsec \
- --rebuild-sections \
+ @( \
+ echo "Scanning source code for xmlsec-core" ; \
+ $(GTKDOC_SCAN) --module=xmlsec \
+ --rebuild-sections \
--output-dir=$(SCAN_DIR) \
--source-dir=$(SOURCE_CODE_DIR)/src/base \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/base
- $(GTKDOC_SCAN) --module=xmlsec-openssl \
- --rebuild-sections \
- --output-dir=$(SCAN_DIR) \
- --source-dir=$(SOURCE_CODE_DIR)/src/openssl \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/openssl
- $(GTKDOC_SCAN) --module=xmlsec-gnutls \
- --rebuild-sections \
- --output-dir=$(SCAN_DIR) \
- --source-dir=$(SOURCE_CODE_DIR)/src/gnutls \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/gnutls
- $(GTKDOC_SCAN) --module=xmlsec-gcrypt \
- --rebuild-sections \
+ --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/base ; \
+ );
+ @(for i in $(CRYPTO_LIBS_LIST) ; do \
+ echo "Scanning source code for xmlsec-$$i" ; \
+ $(GTKDOC_SCAN) --module=xmlsec-$$i \
+ --rebuild-sections \
--output-dir=$(SCAN_DIR) \
- --source-dir=$(SOURCE_CODE_DIR)/src/gcrypt \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/gcrypt
- $(GTKDOC_SCAN) --module=xmlsec-nss \
- --rebuild-sections \
- --output-dir=$(SCAN_DIR) \
- --source-dir=$(SOURCE_CODE_DIR)/src/nss \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/nss
- $(GTKDOC_SCAN) --module=xmlsec-mscrypto \
- --rebuild-sections \
- --output-dir=$(SCAN_DIR) \
- --source-dir=$(SOURCE_CODE_DIR)/src/mscrypto \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/mscrypto
+ --source-dir=$(SOURCE_CODE_DIR)/src/$$i \
+ --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/$$i ; \
+ done);
#
# Prepare source files by coping them to "code" folder and
@@ -317,12 +265,9 @@ dist-hook:
done ; )
clean-local:
- -rm -rf $(SOURCE_CODE_DIR) $(EXAMPLES_DIR) $(SCAN_DIR)/*.txt $(SGML_DIR) $(XML_DIR)
+ -rm -rf $(SOURCE_CODE_DIR) $(EXAMPLES_DIR) $(SCAN_DIR)/*.txt $(SGML_DIR) $(GTKDOC_MKDB_OUTPUT_DIR)
-rm -f *.stamp *.types index.sgml
- ( if [ z"$(TMPL_SRC_DIR)" != z"$(TMPL_DIR)" ] && [ -d "$(TMPL_DIR)" ] ; then \
- chmod -R u+w $(TMPL_DIR) && rm -rf $(TMPL_DIR) ; \
- fi ; )
- ( if [ z"$(builddir)" != z"$(srcdir)" ] ; then \
+ @( if [ z"$(builddir)" != z"$(srcdir)" ] ; then \
chmod -R u+w $(builddir)/src && rm -rf $(builddir)/src ; \
chmod -R u+w $(builddir)/images && rm -rf $(builddir)/images ; \
chmod -R u+w $(builddir)/*.png && rm -rf $(builddir)/*.png ; \
diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in
index 263fd0d..89f5d99 100644
--- a/docs/api/Makefile.in
+++ b/docs/api/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -149,6 +149,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GCRYPT_CFLAGS = @GCRYPT_CFLAGS@
+GCRYPT_CONFIG_PATH = @GCRYPT_CONFIG_PATH@
GCRYPT_CRYPTO_LIB = @GCRYPT_CRYPTO_LIB@
GCRYPT_LIBS = @GCRYPT_LIBS@
GCRYPT_MIN_VERSION = @GCRYPT_MIN_VERSION@
@@ -159,7 +160,6 @@ GNUTLS_MIN_VERSION = @GNUTLS_MIN_VERSION@
GREP = @GREP@
GTKDOC_MKDB = @GTKDOC_MKDB@
GTKDOC_MKHTML = @GTKDOC_MKHTML@
-GTKDOC_MKTMPL = @GTKDOC_MKTMPL@
GTKDOC_SCAN = @GTKDOC_SCAN@
HELP2MAN = @HELP2MAN@
INSTALL = @INSTALL@
@@ -174,10 +174,12 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBXML_CFLAGS = @LIBXML_CFLAGS@
LIBXML_CONFIG = @LIBXML_CONFIG@
+LIBXML_CONFIG_PATH = @LIBXML_CONFIG_PATH@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_MIN_VERSION = @LIBXML_MIN_VERSION@
LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
LIBXSLT_CONFIG = @LIBXSLT_CONFIG@
+LIBXSLT_CONFIG_PATH = @LIBXSLT_CONFIG_PATH@
LIBXSLT_LIBS = @LIBXSLT_LIBS@
LIBXSLT_MIN_VERSION = @LIBXSLT_MIN_VERSION@
LIBXSLT_PC_FILE_COND = @LIBXSLT_PC_FILE_COND@
@@ -191,12 +193,17 @@ MAN2HTML = @MAN2HTML@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCNG_CFLAGS = @MSCNG_CFLAGS@
+MSCNG_CRYPTO_LIB = @MSCNG_CRYPTO_LIB@
+MSCNG_LIBS = @MSCNG_LIBS@
MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
MV = @MV@
NM = @NM@
NMEDIT = @NMEDIT@
+NSPR_CFLAGS = @NSPR_CFLAGS@
+NSPR_LIBS = @NSPR_LIBS@
NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
NSPR_PACKAGE = @NSPR_PACKAGE@
NSS_CFLAGS = @NSS_CFLAGS@
@@ -269,6 +276,7 @@ XMLSEC_NO_GOST2012 = @XMLSEC_NO_GOST2012@
XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
+XMLSEC_NO_MSCNG = @XMLSEC_NO_MSCNG@
XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
XMLSEC_NO_OPENSSL = @XMLSEC_NO_OPENSSL@
@@ -360,20 +368,17 @@ INCLUDE_DIR = $(top_srcdir)/include
INCLUDE_DIR2 = $(top_builddir)/include
SCAN_DIR = $(builddir)
SGML_DIR = $(builddir)/sgml.tmp
-XML_DIR = $(builddir)/xml.tmp
EXAMPLES_DIR = $(SGML_DIR)/examples
SOURCE_CODE_DIR = $(builddir)/code
+GTKDOC_MKDB_OUTPUT_DIR = $(builddir)/xml
# We need to copy some files to make gkdoc happy that
# everything is in one folder
-TMPL_DIR = $(builddir)/tmpl
-TMPL_SRC_DIR = $(srcdir)/tmpl
-MAIN_SGML_FILE = $(SGML_DIR)/xmlsec-main.sgml
+MAIN_SGML_FILE = $(SGML_DIR)/xmlsec.sgml
MAIN_SGML_SRC_FILE = $(srcdir)/src/xmlsec.sgml
SGML_CHAPTERS_DIR = $(SGML_DIR)/chapters
SGML_CHAPTERS_SRC_DIR = $(srcdir)/src/chapters
EXTRA_DIST = \
- $(TMPL_DIR) \
$(srcdir)/src \
$(srcdir)/images \
$(srcdir)/style.css \
@@ -387,6 +392,15 @@ SOURCE_FILES_TO_COPY = \
$(srcdir)/*.png \
$(NULL)
+CRYPTO_LIBS_LIST = \
+ openssl \
+ nss \
+ gnutls \
+ gcrypt \
+ mscrypto \
+ mscng \
+ $(NULL)
+
#
# We need to pre-process original source files
@@ -619,7 +633,7 @@ all: docs
@BUILD_API_DOCS_FALSE@ )
html-cleanup: html
- ( echo "Cleaning up result files"; \
+ @( echo "Cleaning up result files"; \
$(PERL) $(REMOVE_GTKDOCLINK) `find . -name "*.html" -print` \
)
@@ -663,103 +677,46 @@ sgml: sgml-base
mv -f $$i.tmp $$i; \
done);
-sgml-base: templates $(SGML_DIR)/.sentinel
- $(GTKDOC_MKDB) --module=xmlsec \
+# gtkdoc-mkdb doesn't support --output-dir thus we have to "hack" it a litle bit
+sgml-base: scan $(SGML_DIR)/.sentinel
+ @( \
+ echo "Create DocBook files for xmlsec-core" ; \
+ rm -rf $(GTKDOC_MKDB_OUTPUT_DIR) $(SGML_DIR)/base ; \
+ $(GTKDOC_MKDB) --module=xmlsec \
--xml-mode \
--main-sgml-file=$(SGML_DIR)/xmlsec-base.sgml \
- --output-dir=$(SGML_DIR)/ \
- --tmpl-dir=$(TMPL_DIR)/base \
--source-dir=$(SOURCE_CODE_DIR)/src/base \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/base
- $(GTKDOC_MKDB) --module=xmlsec-openssl \
- --xml-mode \
- --main-sgml-file=$(SGML_DIR)/xmlsec-openssl.sgml \
- --tmpl-dir=$(TMPL_DIR)/openssl \
- --output-dir=$(SGML_DIR)/openssl \
- --source-dir=$(SOURCE_CODE_DIR)/src/openssl \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/openssl
- $(GTKDOC_MKDB) --module=xmlsec-gnutls \
- --xml-mode \
- --main-sgml-file=$(SGML_DIR)/xmlsec-gnutls.sgml \
- --tmpl-dir=$(TMPL_DIR)/gnutls \
- --output-dir=$(SGML_DIR)/gnutls \
- --source-dir=$(SOURCE_CODE_DIR)/src/gnutls \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/gnutls
- $(GTKDOC_MKDB) --module=xmlsec-gcrypt \
+ --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/base ; \
+ mv $(GTKDOC_MKDB_OUTPUT_DIR) $(SGML_DIR)/base ; \
+ );
+ @(for i in $(CRYPTO_LIBS_LIST) ; do \
+ echo "Create DocBook files for xmlsec-$$i" ; \
+ rm -rf $(GTKDOC_MKDB_OUTPUT_DIR) $(SGML_DIR)/$$i ; \
+ $(GTKDOC_MKDB) --module=xmlsec-$$i \
--xml-mode \
- --main-sgml-file=$(SGML_DIR)/xmlsec-gcrypt.sgml \
- --tmpl-dir=$(TMPL_DIR)/gcrypt \
- --output-dir=$(SGML_DIR)/gcrypt \
- --source-dir=$(SOURCE_CODE_DIR)/src/gcrypt \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/gcrypt
- $(GTKDOC_MKDB) --module=xmlsec-nss \
- --xml-mode \
- --main-sgml-file=$(SGML_DIR)/xmlsec-nss.sgml \
- --tmpl-dir=$(TMPL_DIR)/nss \
- --output-dir=$(SGML_DIR)/nss \
- --source-dir=$(SOURCE_CODE_DIR)/src/nss \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/nss
- $(GTKDOC_MKDB) --module=xmlsec-mscrypto \
- --xml-mode \
- --main-sgml-file=$(SGML_DIR)/xmlsec-mscrypto.sgml \
- --tmpl-dir=$(TMPL_DIR)/mscrypto \
- --output-dir=$(SGML_DIR)/mscrypto \
- --source-dir=$(SOURCE_CODE_DIR)/src/mscrypto \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/mscrypto
-
-templates: scan templates-copy
- $(GTKDOC_MKTMPL) --module=xmlsec \
- --output-dir=$(TMPL_DIR)/base
- $(GTKDOC_MKTMPL) --module=xmlsec-openssl \
- --output-dir=$(TMPL_DIR)/openssl
- $(GTKDOC_MKTMPL) --module=xmlsec-gnutls \
- --output-dir=$(TMPL_DIR)/gnutls
- $(GTKDOC_MKTMPL) --module=xmlsec-gcrypt \
- --output-dir=$(TMPL_DIR)/gcrypt
- $(GTKDOC_MKTMPL) --module=xmlsec-nss \
- --output-dir=$(TMPL_DIR)/nss
- $(GTKDOC_MKTMPL) --module=xmlsec-mscrypto \
- --output-dir=$(TMPL_DIR)/mscrypto
-
-# make sure to run chmod since we will update templates
-templates-copy: $(TMPL_SRC_DIR) $(TMPL_DIR)/.sentinel
- @echo "Copying original template files into '$(TMPL_DIR)' ..."
- ( if [ z"$(TMPL_DIR)" != z"$(TMPL_SRC_DIR)" ] ; then \
- $(CP) -ru $(TMPL_SRC_DIR)/* $(TMPL_DIR)/ ; \
- fi ; )
- chmod -R u+w $(TMPL_DIR)
+ --main-sgml-file=$(SGML_DIR)/xmlsec-$$i.sgml \
+ --source-dir=$(SOURCE_CODE_DIR)/src/$$i \
+ --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/$$i ; \
+ mv $(GTKDOC_MKDB_OUTPUT_DIR) $(SGML_DIR)/$$i ; \
+ done);
scan: SOURCE_CODEs example_sources
- $(GTKDOC_SCAN) --module=xmlsec \
- --rebuild-sections \
+ @( \
+ echo "Scanning source code for xmlsec-core" ; \
+ $(GTKDOC_SCAN) --module=xmlsec \
+ --rebuild-sections \
--output-dir=$(SCAN_DIR) \
--source-dir=$(SOURCE_CODE_DIR)/src/base \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/base
- $(GTKDOC_SCAN) --module=xmlsec-openssl \
- --rebuild-sections \
- --output-dir=$(SCAN_DIR) \
- --source-dir=$(SOURCE_CODE_DIR)/src/openssl \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/openssl
- $(GTKDOC_SCAN) --module=xmlsec-gnutls \
- --rebuild-sections \
- --output-dir=$(SCAN_DIR) \
- --source-dir=$(SOURCE_CODE_DIR)/src/gnutls \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/gnutls
- $(GTKDOC_SCAN) --module=xmlsec-gcrypt \
- --rebuild-sections \
- --output-dir=$(SCAN_DIR) \
- --source-dir=$(SOURCE_CODE_DIR)/src/gcrypt \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/gcrypt
- $(GTKDOC_SCAN) --module=xmlsec-nss \
- --rebuild-sections \
+ --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/base ; \
+ );
+ @(for i in $(CRYPTO_LIBS_LIST) ; do \
+ echo "Scanning source code for xmlsec-$$i" ; \
+ $(GTKDOC_SCAN) --module=xmlsec-$$i \
+ --rebuild-sections \
--output-dir=$(SCAN_DIR) \
- --source-dir=$(SOURCE_CODE_DIR)/src/nss \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/nss
- $(GTKDOC_SCAN) --module=xmlsec-mscrypto \
- --rebuild-sections \
- --output-dir=$(SCAN_DIR) \
- --source-dir=$(SOURCE_CODE_DIR)/src/mscrypto \
- --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/mscrypto
+ --source-dir=$(SOURCE_CODE_DIR)/src/$$i \
+ --source-dir=$(SOURCE_CODE_DIR)/include/xmlsec/$$i ; \
+ done);
#
# Prepare source files by coping them to "code" folder and
@@ -853,12 +810,9 @@ dist-hook:
done ; )
clean-local:
- -rm -rf $(SOURCE_CODE_DIR) $(EXAMPLES_DIR) $(SCAN_DIR)/*.txt $(SGML_DIR) $(XML_DIR)
+ -rm -rf $(SOURCE_CODE_DIR) $(EXAMPLES_DIR) $(SCAN_DIR)/*.txt $(SGML_DIR) $(GTKDOC_MKDB_OUTPUT_DIR)
-rm -f *.stamp *.types index.sgml
- ( if [ z"$(TMPL_SRC_DIR)" != z"$(TMPL_DIR)" ] && [ -d "$(TMPL_DIR)" ] ; then \
- chmod -R u+w $(TMPL_DIR) && rm -rf $(TMPL_DIR) ; \
- fi ; )
- ( if [ z"$(builddir)" != z"$(srcdir)" ] ; then \
+ @( if [ z"$(builddir)" != z"$(srcdir)" ] ; then \
chmod -R u+w $(builddir)/src && rm -rf $(builddir)/src ; \
chmod -R u+w $(builddir)/images && rm -rf $(builddir)/images ; \
chmod -R u+w $(builddir)/*.png && rm -rf $(builddir)/*.png ; \
diff --git a/docs/api/home.png b/docs/api/home.png
index 28c2e27..b293af5 100644
--- a/docs/api/home.png
+++ b/docs/api/home.png
Binary files differ
diff --git a/docs/api/index.html b/docs/api/index.html
index 32616bd..187f801 100644
--- a/docs/api/index.html
+++ b/docs/api/index.html
@@ -6,7 +6,7 @@
<meta name="description" content="This manual documents the interfaces of the xmlsec library and has some short notes to help get you up to speed with using the library.">
<link rel="home" href="index.html" title="XML Security Library Reference Manual">
<link rel="next" href="xmlsec-notes.html" title="Part I. XML Security Library Tutorial">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
<style type="text/css">
table.CALSTABLE > tbody > tr:nth-child(1) > td:nth-child(1) {
@@ -31,6 +31,29 @@ table.CALSTABLE > tbody > tr:nth-child(1) > td:nth-child(1) {
color: initial;
}
</style>
+<style type="text/css">
+table.CALSTABLE > tbody > tr:nth-child(1) > td:nth-child(1) {
+ width: 20em;
+}
+.synopsis, .classsynopsis {
+ background: #eeeeee;
+ border: solid 1px #aaaaaa;
+}
+.programlisting {
+ background: #eeeeee;
+ border: solid 1px #000000;
+}
+.navigation {
+ background: #eeeeee;
+ border: solid 1px #000000;
+}
+.navigation a {
+ color: initial;
+}
+.navigation a:visited {
+ color: initial;
+}
+</style>
</head>
<body><table width="100%" valign="top"><tr valign="top">
<td valign="top" align="left" width="210">
@@ -235,61 +258,61 @@ table.CALSTABLE > tbody > tr:nth-child(1) > td:nth-child(1) {
<dt><span class="chapter"><a href="xmlsec-ref.html">XML Security Core Library API Reference.</a></span></dt>
<dd><dl>
<dt>
-<span class="refentrytitle"><a href="xmlsec-app.html">app</a></span><span class="refpurpose"> &#8212; Crypto-engine independent application support function.</span>
+<span class="refentrytitle"><a href="xmlsec-app.html">app</a></span><span class="refpurpose"> &#8212; Crypto-engine independent application support functions.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-base64.html">base64</a></span><span class="refpurpose"> &#8212; Base64 encoding/decoding functions.</span>
+<span class="refentrytitle"><a href="xmlsec-base64.html">base64</a></span><span class="refpurpose"> &#8212; Base64 encoding/decoding functions and base64 transform implementation.</span>
</dt>
<dt>
<span class="refentrytitle"><a href="xmlsec-bn.html">bn</a></span><span class="refpurpose"> &#8212; Big numbers support functions.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-buffer.html">buffer</a></span><span class="refpurpose"> &#8212; Binary buffer implementation.</span>
+<span class="refentrytitle"><a href="xmlsec-buffer.html">buffer</a></span><span class="refpurpose"> &#8212; Binary memory buffer functions.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-dl.html">dl</a></span><span class="refpurpose"> &#8212; Dynamic crypto-engine library loading support.</span>
+<span class="refentrytitle"><a href="xmlsec-dl.html">dl</a></span><span class="refpurpose"> &#8212; Dynamic crypto-engine library loading functions.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-errors.html">errors</a></span><span class="refpurpose"> &#8212; Error/log messages support.</span>
+<span class="refentrytitle"><a href="xmlsec-errors.html">errors</a></span><span class="refpurpose"> &#8212; Error reporting and logging functions.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-io.html">io</a></span><span class="refpurpose"> &#8212; Input/output support.</span>
+<span class="refentrytitle"><a href="xmlsec-io.html">io</a></span><span class="refpurpose"> &#8212; Input/output functions.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-keyinfo.html">keyinfo</a></span><span class="refpurpose"> &#8212; &lt;dsig:KeyInfo/&gt; node parser.</span>
+<span class="refentrytitle"><a href="xmlsec-keyinfo.html">keyinfo</a></span><span class="refpurpose"> &#8212; &lt;dsig:KeyInfo/&gt; node parser functions.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-keysdata.html">keysdata</a></span><span class="refpurpose"> &#8212; Crypto key data object definition.</span>
+<span class="refentrytitle"><a href="xmlsec-keysdata.html">keysdata</a></span><span class="refpurpose"> &#8212; Crypto key data object functions.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-keys.html">keys</a></span><span class="refpurpose"> &#8212; Crypto key object definition.</span>
+<span class="refentrytitle"><a href="xmlsec-keys.html">keys</a></span><span class="refpurpose"> &#8212; Crypto key object functions.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-keysmngr.html">keysmngr</a></span><span class="refpurpose"> &#8212; Keys manager object support.</span>
+<span class="refentrytitle"><a href="xmlsec-keysmngr.html">keysmngr</a></span><span class="refpurpose"> &#8212; Keys manager object functions.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-list.html">list</a></span><span class="refpurpose"> &#8212; Generic list structure implementation.</span>
+<span class="refentrytitle"><a href="xmlsec-list.html">list</a></span><span class="refpurpose"> &#8212; Generic list structure functions.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-membuf.html">membuf</a></span><span class="refpurpose"> &#8212; Memory buffer transform implementation.</span>
+<span class="refentrytitle"><a href="xmlsec-membuf.html">membuf</a></span><span class="refpurpose"> &#8212; Memory buffer transform functions.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-nodeset.html">nodeset</a></span><span class="refpurpose"> &#8212; Nodeset object implementation.</span>
+<span class="refentrytitle"><a href="xmlsec-nodeset.html">nodeset</a></span><span class="refpurpose"> &#8212; XML nodes set functions</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-parser.html">parser</a></span><span class="refpurpose"> &#8212; Parser transform implementation.</span>
+<span class="refentrytitle"><a href="xmlsec-parser.html">parser</a></span><span class="refpurpose"> &#8212; XML parser functions and the XML parser transform implementation.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-templates.html">templates</a></span><span class="refpurpose"> &#8212; Dynamic templates creation functions.</span>
+<span class="refentrytitle"><a href="xmlsec-templates.html">templates</a></span><span class="refpurpose"> &#8212; XML signature and encryption template functions.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-transforms.html">transforms</a></span><span class="refpurpose"> &#8212; Transform object definition.</span>
+<span class="refentrytitle"><a href="xmlsec-transforms.html">transforms</a></span><span class="refpurpose"> &#8212; Transform object functions.</span>
</dt>
<dt>
<span class="refentrytitle"><a href="xmlsec-version.html">version</a></span><span class="refpurpose"> &#8212; Version macros.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-xmldsig.html">xmldsig</a></span><span class="refpurpose"> &#8212; XML Digital Signature support.</span>
+<span class="refentrytitle"><a href="xmlsec-xmldsig.html">xmldsig</a></span><span class="refpurpose"> &#8212; XML Digital Signature functions.</span>
</dt>
<dt>
<span class="refentrytitle"><a href="xmlsec-xmlenc.html">xmlenc</a></span><span class="refpurpose"> &#8212; XML Encryption support.</span>
@@ -298,46 +321,46 @@ table.CALSTABLE > tbody > tr:nth-child(1) > td:nth-child(1) {
<span class="refentrytitle"><a href="xmlsec-xmlsec.html">xmlsec</a></span><span class="refpurpose"> &#8212; Utility functions.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-xmltree.html">xmltree</a></span><span class="refpurpose"> &#8212; XML tree operations.</span>
+<span class="refentrytitle"><a href="xmlsec-xmltree.html">xmltree</a></span><span class="refpurpose"> &#8212; XML tree functions.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-x509.html">x509</a></span><span class="refpurpose"> &#8212; &lt;dsig:X509Certificate/&gt; node parser.</span>
+<span class="refentrytitle"><a href="xmlsec-x509.html">x509</a></span><span class="refpurpose"> &#8212; &lt;dsig:X509Certificate/&gt; node parser functions.</span>
</dt>
</dl></dd>
<dt><span class="chapter"><a href="xmlsec-openssl-ref.html">XML Security Library for OpenSLL API Reference.</a></span></dt>
<dd><dl>
<dt>
-<span class="refentrytitle"><a href="xmlsec-openssl-app.html">app</a></span><span class="refpurpose"> &#8212; Application functions implementation for OpenSSL.</span>
+<span class="refentrytitle"><a href="xmlsec-openssl-app.html">app</a></span><span class="refpurpose"> &#8212; Application support functions for OpenSSL.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-openssl-bn.html">bn</a></span><span class="refpurpose"> &#8212; Big numbers helper functions.</span>
+<span class="refentrytitle"><a href="xmlsec-openssl-bn.html">bn</a></span><span class="refpurpose"> &#8212; Big numbers (BIGNUM) support functions implementation for OpenSSL.</span>
</dt>
<dt>
<span class="refentrytitle"><a href="xmlsec-openssl-crypto.html">crypto</a></span><span class="refpurpose"> &#8212; Crypto transforms implementation for OpenSSL.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-openssl-evp.html">evp</a></span><span class="refpurpose"> &#8212; EVP keys data implementation.</span>
+<span class="refentrytitle"><a href="xmlsec-openssl-evp.html">evp</a></span><span class="refpurpose"> &#8212; Private/public (EVP) keys implementation for OpenSSL.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-openssl-x509.html">x509</a></span><span class="refpurpose"> &#8212; X509 certificates support implementation for OpenSSL.</span>
+<span class="refentrytitle"><a href="xmlsec-openssl-x509.html">x509</a></span><span class="refpurpose"> &#8212; X509 certificates implementation for OpenSSL.</span>
</dt>
</dl></dd>
<dt><span class="chapter"><a href="xmlsec-gnutls-ref.html">XML Security Library for GnuTLS API Reference.</a></span></dt>
<dd><dl>
<dt>
-<span class="refentrytitle"><a href="xmlsec-gnutls-app.html">app</a></span><span class="refpurpose"> &#8212; Application functions implementation for GnuTLS.</span>
+<span class="refentrytitle"><a href="xmlsec-gnutls-app.html">app</a></span><span class="refpurpose"> &#8212; Application support functions for GnuTLS.</span>
</dt>
<dt>
<span class="refentrytitle"><a href="xmlsec-gnutls-crypto.html">crypto</a></span><span class="refpurpose"> &#8212; Crypto transforms implementation for GnuTLS.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-gnutls-x509.html">x509</a></span><span class="refpurpose"> &#8212; X509 certificates support implementation for GnuTLS.</span>
+<span class="refentrytitle"><a href="xmlsec-gnutls-x509.html">x509</a></span><span class="refpurpose"> &#8212; X509 certificates implementation for GnuTLS.</span>
</dt>
</dl></dd>
<dt><span class="chapter"><a href="xmlsec-gcrypt-ref.html">XML Security Library for GCrypt API Reference.</a></span></dt>
<dd><dl>
<dt>
-<span class="refentrytitle"><a href="xmlsec-gcrypt-app.html">app</a></span><span class="refpurpose"> &#8212; Application functions implementation for GnuTLS.</span>
+<span class="refentrytitle"><a href="xmlsec-gcrypt-app.html">app</a></span><span class="refpurpose"> &#8212; Application support functions for GCrypt.</span>
</dt>
<dt>
<span class="refentrytitle"><a href="xmlsec-gcrypt-crypto.html">crypto</a></span><span class="refpurpose"> &#8212; Crypto transforms implementation for GCrypt.</span>
@@ -346,10 +369,10 @@ table.CALSTABLE > tbody > tr:nth-child(1) > td:nth-child(1) {
<dt><span class="chapter"><a href="xmlsec-nss-ref.html">XML Security Library for NSS API Reference.</a></span></dt>
<dd><dl>
<dt>
-<span class="refentrytitle"><a href="xmlsec-nss-app.html">app</a></span><span class="refpurpose"> &#8212; Application functions implementation for NSS.</span>
+<span class="refentrytitle"><a href="xmlsec-nss-app.html">app</a></span><span class="refpurpose"> &#8212; Application support functions for NSS.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-nss-bignum.html">bignum</a></span><span class="refpurpose"> &#8212; Big numbers helper functions.</span>
+<span class="refentrytitle"><a href="xmlsec-nss-bignum.html">bignum</a></span><span class="refpurpose"> &#8212; Big numbers support functions implementation for NSS.</span>
</dt>
<dt>
<span class="refentrytitle"><a href="xmlsec-nss-crypto.html">crypto</a></span><span class="refpurpose"> &#8212; Crypto transforms implementation for NSS.</span>
@@ -358,28 +381,46 @@ table.CALSTABLE > tbody > tr:nth-child(1) > td:nth-child(1) {
<span class="refentrytitle"><a href="xmlsec-nss-keysstore.html">keysstore</a></span><span class="refpurpose"> &#8212; Keys store implementation for NSS.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-nss-pkikeys.html">pkikeys</a></span><span class="refpurpose"> &#8212; PKI keys data implementation.</span>
+<span class="refentrytitle"><a href="xmlsec-nss-pkikeys.html">pkikeys</a></span><span class="refpurpose"> &#8212; Private/public keys implementation for NSS.</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="xmlsec-nss-x509.html">x509</a></span><span class="refpurpose"> &#8212; X509 certificates implementation for NSS.</span>
+</dt>
+</dl></dd>
+<dt><span class="chapter"><a href="xmlsec-mscrypto-ref.html">XML Security Library for Microsoft Crypto API Reference.</a></span></dt>
+<dd><dl>
+<dt>
+<span class="refentrytitle"><a href="xmlsec-mscrypto-app.html">app</a></span><span class="refpurpose"> &#8212; Application support functions for Microsoft Crypto API.</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="xmlsec-mscrypto-certkeys.html">certkeys</a></span><span class="refpurpose"> &#8212; Certificate keys support functions for Microsoft Crypto API.</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="xmlsec-mscrypto-crypto.html">crypto</a></span><span class="refpurpose"> &#8212; Crypto transforms implementation for Microsoft Crypto API.</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="xmlsec-mscrypto-keysstore.html">keysstore</a></span><span class="refpurpose"> &#8212; Keys store implementation for Microsoft Crypto API.</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-nss-x509.html">x509</a></span><span class="refpurpose"> &#8212; X509 certificates support implementation for NSS.</span>
+<span class="refentrytitle"><a href="xmlsec-mscrypto-x509.html">x509</a></span><span class="refpurpose"> &#8212; X509 certificates implementation for Microsoft Crypto API.</span>
</dt>
</dl></dd>
-<dt><span class="chapter"><a href="xmlsec-mscrypto-ref.html">XML Security Library for MSCrypto API Reference.</a></span></dt>
+<dt><span class="chapter"><a href="xmlsec-msccng-ref.html">XML Security Library for Microsoft Cryptography API: Next Generation (CNG) Reference.</a></span></dt>
<dd><dl>
<dt>
-<span class="refentrytitle"><a href="xmlsec-mscrypto-app.html">app</a></span><span class="refpurpose"> &#8212; Application functions implementation for MS Crypto.</span>
+<span class="refentrytitle"><a href="xmlsec-mscng-app.html">app</a></span><span class="refpurpose"> &#8212; Application support functions for Microsoft Cryptography API: Next Generation (CNG).</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-mscrypto-certkeys.html">certkeys</a></span><span class="refpurpose"> &#8212; MS Crypto certificates helper functions.</span>
+<span class="refentrytitle"><a href="xmlsec-mscng-certkeys.html">certkeys</a></span><span class="refpurpose"> &#8212; Certificate keys support functions for Microsoft Cryptography API: Next Generation (CNG).</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-mscrypto-crypto.html">crypto</a></span><span class="refpurpose"> &#8212; Crypto transforms implementation for MS Crypto.</span>
+<span class="refentrytitle"><a href="xmlsec-mscng-crypto.html">crypto</a></span><span class="refpurpose"> &#8212; Crypto transforms implementation for Microsoft Cryptography API: Next Generation (CNG).</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-mscrypto-keysstore.html">keysstore</a></span><span class="refpurpose"> &#8212; Keys store implementation for MS Crypto.</span>
+<span class="refentrytitle"><a href="xmlsec-mscng-keysstore.html">keysstore</a></span><span class="refpurpose"> &#8212; Keys store implementation for Microsoft Cryptography API: Next Generation (CNG).</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="xmlsec-mscrypto-x509.html">x509</a></span><span class="refpurpose"> &#8212; X509 certificates support implementation for MS Crypto.</span>
+<span class="refentrytitle"><a href="xmlsec-mscng-x509.html">x509</a></span><span class="refpurpose"> &#8212; X509 certificates implementation for Microsoft Cryptography API: Next Generation (CNG).</span>
</dt>
</dl></dd>
<dt><span class="chapter"><a href="xmlsec-index.html">XML Security Library Reference Index</a></span></dt>
@@ -387,7 +428,7 @@ table.CALSTABLE > tbody > tr:nth-child(1) > td:nth-child(1) {
</dl></div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.27</div>
</td></tr></table></td>
</tr></table></body>
</html>
diff --git a/docs/api/left-insensitive.png b/docs/api/left-insensitive.png
index 38ffe3e..903790a 100644
--- a/docs/api/left-insensitive.png
+++ b/docs/api/left-insensitive.png
Binary files differ
diff --git a/docs/api/left.png b/docs/api/left.png
index 1b204ab..21b31e3 100644
--- a/docs/api/left.png
+++ b/docs/api/left.png
Binary files differ
diff --git a/docs/api/right-insensitive.png b/docs/api/right-insensitive.png
index f999f00..a3696bf 100644
--- a/docs/api/right-insensitive.png
+++ b/docs/api/right-insensitive.png
Binary files differ
diff --git a/docs/api/right.png b/docs/api/right.png
index 4653997..73d25da 100644
--- a/docs/api/right.png
+++ b/docs/api/right.png
Binary files differ
diff --git a/docs/api/src/xmlsec.sgml b/docs/api/src/xmlsec.sgml
index 2a84790..d418adb 100644
--- a/docs/api/src/xmlsec.sgml
+++ b/docs/api/src/xmlsec.sgml
@@ -16,29 +16,29 @@ http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
<!ENTITY xmlsec-index SYSTEM "xmlsec-index.sgml">
-<!ENTITY xmlsec-app "app.xml">
-<!ENTITY xmlsec-base64 "base64.xml">
-<!ENTITY xmlsec-bn "bn.xml">
-<!ENTITY xmlsec-buffer "buffer.xml">
-<!ENTITY xmlsec-dl "dl.xml">
-<!ENTITY xmlsec-errors "errors.xml">
-<!ENTITY xmlsec-io "io.xml">
-<!ENTITY xmlsec-keyinfo "keyinfo.xml">
-<!ENTITY xmlsec-keysdata "keysdata.xml">
-<!ENTITY xmlsec-keys "keys.xml">
-<!ENTITY xmlsec-keysmngr "keysmngr.xml">
-<!ENTITY xmlsec-list "list.xml">
-<!ENTITY xmlsec-membuf "membuf.xml">
-<!ENTITY xmlsec-nodeset "nodeset.xml">
-<!ENTITY xmlsec-parser "parser.xml">
-<!ENTITY xmlsec-templates "templates.xml">
-<!ENTITY xmlsec-transforms "transforms.xml">
-<!ENTITY xmlsec-version "version.xml">
-<!ENTITY xmlsec-x509 "x509.xml">
-<!ENTITY xmlsec-xmldsig "xmldsig.xml">
-<!ENTITY xmlsec-xmlenc "xmlenc.xml">
-<!ENTITY xmlsec-xmlsec "xmlsec.xml">
-<!ENTITY xmlsec-xmltree "xmltree.xml">
+<!ENTITY xmlsec-app "base/app.xml">
+<!ENTITY xmlsec-base64 "base/base64.xml">
+<!ENTITY xmlsec-bn "base/bn.xml">
+<!ENTITY xmlsec-buffer "base/buffer.xml">
+<!ENTITY xmlsec-dl "base/dl.xml">
+<!ENTITY xmlsec-errors "base/errors.xml">
+<!ENTITY xmlsec-io "base/io.xml">
+<!ENTITY xmlsec-keyinfo "base/keyinfo.xml">
+<!ENTITY xmlsec-keysdata "base/keysdata.xml">
+<!ENTITY xmlsec-keys "base/keys.xml">
+<!ENTITY xmlsec-keysmngr "base/keysmngr.xml">
+<!ENTITY xmlsec-list "base/list.xml">
+<!ENTITY xmlsec-membuf "base/membuf.xml">
+<!ENTITY xmlsec-nodeset "base/nodeset.xml">
+<!ENTITY xmlsec-parser "base/parser.xml">
+<!ENTITY xmlsec-templates "base/templates.xml">
+<!ENTITY xmlsec-transforms "base/transforms.xml">
+<!ENTITY xmlsec-version "base/version.xml">
+<!ENTITY xmlsec-x509 "base/x509.xml">
+<!ENTITY xmlsec-xmldsig "base/xmldsig.xml">
+<!ENTITY xmlsec-xmlenc "base/xmlenc.xml">
+<!ENTITY xmlsec-xmlsec "base/xmlsec.xml">
+<!ENTITY xmlsec-xmltree "base/xmltree.xml">
<!ENTITY xmlsec-openssl-app "openssl/app.xml">
<!ENTITY xmlsec-openssl-bn "openssl/bn.xml">
@@ -66,6 +66,12 @@ http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
<!ENTITY xmlsec-mscrypto-keysstore "mscrypto/keysstore.xml">
<!ENTITY xmlsec-mscrypto-x509 "mscrypto/x509.xml">
+<!ENTITY xmlsec-mscng-app "mscng/app.xml">
+<!ENTITY xmlsec-mscng-certkeys "mscng/certkeys.xml">
+<!ENTITY xmlsec-mscng-crypto "mscng/crypto.xml">
+<!ENTITY xmlsec-mscng-keysstore "mscng/keysstore.xml">
+<!ENTITY xmlsec-mscng-x509 "mscng/x509.xml">
+
<!ENTITY xmlsec-example-sign1 SYSTEM "examples/sign1.sgml">
<!ENTITY xmlsec-example-sign2 SYSTEM "examples/sign2.sgml">
<!ENTITY xmlsec-example-sign3 SYSTEM "examples/sign3.sgml">
@@ -101,7 +107,7 @@ http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
<!ENTITY xmlsec-example-encrypt3-doc SYSTEM "examples/encrypt3-doc.sgml">
<!ENTITY xmlsec-example-encrypt3-res SYSTEM "examples/encrypt3-res.sgml">
]>
-<book id="index">
+<book id="index" xmlns:xi="http://www.w3.org/2001/XInclude">
<bookinfo>
<title>XML Security Library Reference Manual</title>
<authorgroup>
@@ -148,14 +154,15 @@ http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
<para>XML Security Library provides support for XML Digital Signature
and XML Encryption. It is based on LibXML/LibXSLT and can use
practicaly any crypto library (currently there is "out of the box"
- support for OpenSSL, MSCrypto, GnuTLS, GCrypt and NSS).
+ support for OpenSSL, Microsoft Crypto API, Microsoft Cryptography API:
+ Next Generation (CNG), GnuTLS, GCrypt and NSS).
</para>
</chapter>
<chapter id="xmlsec-notes-structure">
<title>XML Security Library Structure.</title>
<para>In order to provide the an ability to use different crypto engines,
the XML Security Library is splitted in two parts: core library (xmlsec)
- and crypto library (xmlsec-openssl, xmlsec-mscrypt, xmlsec-gnutls,
+ and crypto library (xmlsec-openssl, xmlsec-mscrypt, xmlsec-mscng, xmlsec-gnutls,
xmlsec-gcrypt, xmlsec-nss, ...).
<figure>
<title>The library structure and dependencies.</title>
@@ -212,29 +219,29 @@ http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
the public interfaces are documented here. This reference guide is
build by extracting comments from the code sources. </para>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-app;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-base64;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-bn;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-buffer;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-dl;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-errors;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-io;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-keyinfo;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-keysdata;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-keys;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-keysmngr;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-list;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-membuf;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-nodeset;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-parser;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-templates;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-transforms;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-version;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-xmldsig;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-xmlenc;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-xmlsec;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-xmltree;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-x509;"/>
+ <xi:include href="&xmlsec-app;"/>
+ <xi:include href="&xmlsec-base64;"/>
+ <xi:include href="&xmlsec-bn;"/>
+ <xi:include href="&xmlsec-buffer;"/>
+ <xi:include href="&xmlsec-dl;"/>
+ <xi:include href="&xmlsec-errors;"/>
+ <xi:include href="&xmlsec-io;"/>
+ <xi:include href="&xmlsec-keyinfo;"/>
+ <xi:include href="&xmlsec-keysdata;"/>
+ <xi:include href="&xmlsec-keys;"/>
+ <xi:include href="&xmlsec-keysmngr;"/>
+ <xi:include href="&xmlsec-list;"/>
+ <xi:include href="&xmlsec-membuf;"/>
+ <xi:include href="&xmlsec-nodeset;"/>
+ <xi:include href="&xmlsec-parser;"/>
+ <xi:include href="&xmlsec-templates;"/>
+ <xi:include href="&xmlsec-transforms;"/>
+ <xi:include href="&xmlsec-version;"/>
+ <xi:include href="&xmlsec-xmldsig;"/>
+ <xi:include href="&xmlsec-xmlenc;"/>
+ <xi:include href="&xmlsec-xmlsec;"/>
+ <xi:include href="&xmlsec-xmltree;"/>
+ <xi:include href="&xmlsec-x509;"/>
</chapter>
<chapter id="xmlsec-openssl-ref">
@@ -243,11 +250,11 @@ http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
the public interfaces are documented here. This reference guide is
build by extracting comments from the code sources. </para>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-openssl-app;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-openssl-bn;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-openssl-crypto;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-openssl-evp;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-openssl-x509;"/>
+ <xi:include href="&xmlsec-openssl-app;"/>
+ <xi:include href="&xmlsec-openssl-bn;"/>
+ <xi:include href="&xmlsec-openssl-crypto;"/>
+ <xi:include href="&xmlsec-openssl-evp;"/>
+ <xi:include href="&xmlsec-openssl-x509;"/>
</chapter>
<chapter id="xmlsec-gnutls-ref">
@@ -256,9 +263,9 @@ http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
the public interfaces are documented here. This reference guide is
build by extracting comments from the code sources. </para>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-gnutls-app;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-gnutls-crypto;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-gnutls-x509;"/>
+ <xi:include href="&xmlsec-gnutls-app;"/>
+ <xi:include href="&xmlsec-gnutls-crypto;"/>
+ <xi:include href="&xmlsec-gnutls-x509;"/>
</chapter>
<chapter id="xmlsec-gcrypt-ref">
@@ -267,8 +274,8 @@ http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
the public interfaces are documented here. This reference guide is
build by extracting comments from the code sources. </para>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-gcrypt-app;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-gcrypt-crypto;"/>
+ <xi:include href="&xmlsec-gcrypt-app;"/>
+ <xi:include href="&xmlsec-gcrypt-crypto;"/>
</chapter>
<chapter id="xmlsec-nss-ref">
@@ -277,27 +284,44 @@ http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
the public interfaces are documented here. This reference guide is
build by extracting comments from the code sources. </para>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-nss-app;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-nss-bignum;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-nss-crypto;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-nss-keysstore;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-nss-pkikeys;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-nss-x509;"/>
+ <xi:include href="&xmlsec-nss-app;"/>
+ <xi:include href="&xmlsec-nss-bignum;"/>
+ <xi:include href="&xmlsec-nss-crypto;"/>
+ <xi:include href="&xmlsec-nss-keysstore;"/>
+ <xi:include href="&xmlsec-nss-pkikeys;"/>
+ <xi:include href="&xmlsec-nss-x509;"/>
</chapter>
<chapter id="xmlsec-mscrypto-ref">
- <title>XML Security Library for MSCrypto API Reference.</title>
- <para>This section contains the API reference for xmlsec-mscrypto. All
- the public interfaces are documented here. This reference guide is
- build by extracting comments from the code sources. </para>
+ <title>XML Security Library for Microsoft Crypto API Reference.</title>
+ <para>This section contains the API reference for xmlsec-mscrypto (based on
+ Microsoft Crypto API). All the public interfaces are documented here.
+ This reference guide is build by extracting comments from the code sources.
+ </para>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-mscrypto-app;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-mscrypto-certkeys;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-mscrypto-crypto;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-mscrypto-keysstore;"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="&xmlsec-mscrypto-x509;"/>
+ <xi:include href="&xmlsec-mscrypto-app;"/>
+ <xi:include href="&xmlsec-mscrypto-certkeys;"/>
+ <xi:include href="&xmlsec-mscrypto-crypto;"/>
+ <xi:include href="&xmlsec-mscrypto-keysstore;"/>
+ <xi:include href="&xmlsec-mscrypto-x509;"/>
</chapter>
+
+ <chapter id="xmlsec-msccng-ref">
+ <title>XML Security Library for Microsoft Cryptography API: Next Generation (CNG) Reference.</title>
+ <para>This section contains the API reference for xmlsec-mscng (based on
+ <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/aa376210(v=vs.85).aspx">Microsoft
+ Cryptography API: Next Generation (CNG)</a>). All the public interfaces are
+ documented here. This reference guide is build by extracting comments from
+ the code sources. </para>
+
+ <xi:include href="&xmlsec-mscng-app;"/>
+ <xi:include href="&xmlsec-mscng-certkeys;"/>
+ <xi:include href="&xmlsec-mscng-crypto;"/>
+ <xi:include href="&xmlsec-mscng-keysstore;"/>
+ <xi:include href="&xmlsec-mscng-x509;"/>
+ </chapter>
+
<chapter id="xmlsec-index">
<title>XML Security Library Reference Index</title>
<para>
diff --git a/docs/api/tmpl/base/app.sgml b/docs/api/tmpl/base/app.sgml
deleted file mode 100644
index b725a3b..0000000
--- a/docs/api/tmpl/base/app.sgml
+++ /dev/null
@@ -1,1112 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-app
-
-<!-- ##### SECTION Short_Description ##### -->
-Crypto-engine independent application support function.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Crypto-engine application support function used by xmlsec command line utility.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION xmlSecCryptoInit ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoShutdown ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoKeysMngrInit ##### -->
-<para>
-
-</para>
-
-@mngr:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyDataAesId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataAesGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyDataDesId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataDesGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyDataDsaId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataDsaGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyDataEcdsaId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataEcdsaGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyDataGost2001Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataGost2001GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyDataGostR3410_2012_256Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataGostR3410_2012_256GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyDataGostR3410_2012_512Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataGostR3410_2012_512GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyDataHmacId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataHmacGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyDataRsaId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataRsaGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyDataX509Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataX509GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyDataRawX509CertId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataRawX509CertGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecX509StoreId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecX509StoreGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformAes128CbcId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformAes128CbcGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformAes192CbcId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformAes192CbcGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformAes256CbcId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformAes256CbcGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformKWAes128Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformKWAes128GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformKWAes192Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformKWAes192GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformKWAes256Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformKWAes256GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformDes3CbcId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformDes3CbcGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformKWDes3Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformKWDes3GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformDsaSha1Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformDsaSha1GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformDsaSha256Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformDsaSha256GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformEcdsaSha1Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformEcdsaSha1GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformEcdsaSha224Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformEcdsaSha224GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformEcdsaSha256Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformEcdsaSha256GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformEcdsaSha384Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformEcdsaSha384GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformEcdsaSha512Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformEcdsaSha512GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformGost2001GostR3411_94Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformGost2001GostR3411_94GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformGostR3410_2012GostR3411_2012_256Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformGostR3410_2012GostR3411_2012_256GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformGostR3410_2012GostR3411_2012_512Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformGostR3410_2012GostR3411_2012_512GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformHmacMd5Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformHmacMd5GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformHmacRipemd160Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformHmacRipemd160GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformHmacSha1Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformHmacSha1GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformHmacSha224Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformHmacSha224GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformHmacSha256Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformHmacSha256GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformHmacSha384Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformHmacSha384GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformHmacSha512Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformHmacSha512GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformMd5Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformMd5GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformRipemd160Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformRipemd160GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformRsaMd5Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformRsaMd5GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformRsaRipemd160Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformRsaRipemd160GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformRsaSha1Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformRsaSha1GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformRsaSha224Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformRsaSha224GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformRsaSha256Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformRsaSha256GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformRsaSha384Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformRsaSha384GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformRsaSha512Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformRsaSha512GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformRsaPkcs1Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformRsaPkcs1GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformRsaOaepId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformRsaOaepGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformGostR3411_94Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformGostR3411_94GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformGostR3411_2012_256Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformGostR3411_2012_256GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformGostR3411_2012_512Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformGostR3411_2012_512GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformSha1Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformSha1GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformSha224Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformSha224GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformSha256Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformSha256GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformSha384Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformSha384GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformSha512Id ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformSha512GetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoAppInit ##### -->
-<para>
-
-</para>
-
-@config:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoAppShutdown ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoAppDefaultKeysMngrInit ##### -->
-<para>
-
-</para>
-
-@mngr:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoAppDefaultKeysMngrAdoptKey ##### -->
-<para>
-
-</para>
-
-@mngr:
-@key:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoAppDefaultKeysMngrLoad ##### -->
-<para>
-
-</para>
-
-@mngr:
-@uri:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoAppDefaultKeysMngrSave ##### -->
-<para>
-
-</para>
-
-@mngr:
-@filename:
-@type:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoAppKeysMngrCertLoad ##### -->
-<para>
-
-</para>
-
-@mngr:
-@filename:
-@format:
-@type:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoAppKeysMngrCertLoadMemory ##### -->
-<para>
-
-</para>
-
-@mngr:
-@data:
-@dataSize:
-@format:
-@type:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoAppKeyLoad ##### -->
-<para>
-
-</para>
-
-@filename:
-@format:
-@pwd:
-@pwdCallback:
-@pwdCallbackCtx:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoAppKeyLoadMemory ##### -->
-<para>
-
-</para>
-
-@data:
-@dataSize:
-@format:
-@pwd:
-@pwdCallback:
-@pwdCallbackCtx:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoAppPkcs12Load ##### -->
-<para>
-
-</para>
-
-@filename:
-@pwd:
-@pwdCallback:
-@pwdCallbackCtx:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoAppPkcs12LoadMemory ##### -->
-<para>
-
-</para>
-
-@data:
-@dataSize:
-@pwd:
-@pwdCallback:
-@pwdCallbackCtx:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoAppKeyCertLoad ##### -->
-<para>
-
-</para>
-
-@key:
-@filename:
-@format:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoAppKeyCertLoadMemory ##### -->
-<para>
-
-</para>
-
-@key:
-@data:
-@dataSize:
-@format:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoAppGetDefaultPwdCallback ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
diff --git a/docs/api/tmpl/base/base64.sgml b/docs/api/tmpl/base/base64.sgml
deleted file mode 100644
index a6d4ebf..0000000
--- a/docs/api/tmpl/base/base64.sgml
+++ /dev/null
@@ -1,129 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-base64
-
-<!-- ##### SECTION Short_Description ##### -->
-Base64 encoding/decoding functions.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Base64 encoding/decoding functions.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO XMLSEC_BASE64_LINESIZE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecBase64GetDefaultLineSize ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBase64SetDefaultLineSize ##### -->
-<para>
-
-</para>
-
-@columns:
-
-
-<!-- ##### FUNCTION xmlSecBase64CtxCreate ##### -->
-<para>
-
-</para>
-
-@encode:
-@columns:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBase64CtxDestroy ##### -->
-<para>
-
-</para>
-
-@ctx:
-
-
-<!-- ##### FUNCTION xmlSecBase64CtxInitialize ##### -->
-<para>
-
-</para>
-
-@ctx:
-@encode:
-@columns:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBase64CtxFinalize ##### -->
-<para>
-
-</para>
-
-@ctx:
-
-
-<!-- ##### FUNCTION xmlSecBase64CtxUpdate ##### -->
-<para>
-
-</para>
-
-@ctx:
-@in:
-@inSize:
-@out:
-@outSize:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBase64CtxFinal ##### -->
-<para>
-
-</para>
-
-@ctx:
-@out:
-@outSize:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBase64Encode ##### -->
-<para>
-
-</para>
-
-@buf:
-@len:
-@columns:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBase64Decode ##### -->
-<para>
-
-</para>
-
-@str:
-@buf:
-@len:
-@Returns:
-
-
diff --git a/docs/api/tmpl/base/bn.sgml b/docs/api/tmpl/base/bn.sgml
deleted file mode 100644
index 8b000f2..0000000
--- a/docs/api/tmpl/base/bn.sgml
+++ /dev/null
@@ -1,263 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-bn
-
-<!-- ##### SECTION Short_Description ##### -->
-Big numbers support functions.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Big numbers support functions.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM xmlSecBnFormat ##### -->
-<para>
-
-</para>
-
-@xmlSecBnBase64:
-@xmlSecBnHex:
-@xmlSecBnDec:
-
-<!-- ##### FUNCTION xmlSecBnCreate ##### -->
-<para>
-
-</para>
-
-@size:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnDestroy ##### -->
-<para>
-
-</para>
-
-@bn:
-
-
-<!-- ##### FUNCTION xmlSecBnInitialize ##### -->
-<para>
-
-</para>
-
-@bn:
-@size:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnFinalize ##### -->
-<para>
-
-</para>
-
-@bn:
-
-
-<!-- ##### FUNCTION xmlSecBnGetData ##### -->
-<para>
-
-</para>
-
-@bn:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnSetData ##### -->
-<para>
-
-</para>
-
-@bn:
-@data:
-@size:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnGetSize ##### -->
-<para>
-
-</para>
-
-@bn:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnZero ##### -->
-<para>
-
-</para>
-
-@bn:
-
-
-<!-- ##### FUNCTION xmlSecBnFromString ##### -->
-<para>
-
-</para>
-
-@bn:
-@str:
-@base:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnToString ##### -->
-<para>
-
-</para>
-
-@bn:
-@base:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnFromHexString ##### -->
-<para>
-
-</para>
-
-@bn:
-@str:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnToHexString ##### -->
-<para>
-
-</para>
-
-@bn:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnFromDecString ##### -->
-<para>
-
-</para>
-
-@bn:
-@str:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnToDecString ##### -->
-<para>
-
-</para>
-
-@bn:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnMul ##### -->
-<para>
-
-</para>
-
-@bn:
-@multiplier:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnDiv ##### -->
-<para>
-
-</para>
-
-@bn:
-@divider:
-@mod:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnAdd ##### -->
-<para>
-
-</para>
-
-@bn:
-@delta:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnReverse ##### -->
-<para>
-
-</para>
-
-@bn:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnCompare ##### -->
-<para>
-
-</para>
-
-@bn:
-@data:
-@dataSize:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnCompareReverse ##### -->
-<para>
-
-</para>
-
-@bn:
-@data:
-@dataSize:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnGetNodeValue ##### -->
-<para>
-
-</para>
-
-@bn:
-@cur:
-@format:
-@reverse:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnSetNodeValue ##### -->
-<para>
-
-</para>
-
-@bn:
-@cur:
-@format:
-@reverse:
-@addLineBreaks:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBnBlobSetNodeValue ##### -->
-<para>
-
-</para>
-
-@data:
-@dataSize:
-@cur:
-@format:
-@reverse:
-@addLineBreaks:
-@Returns:
-
-
diff --git a/docs/api/tmpl/base/buffer.sgml b/docs/api/tmpl/base/buffer.sgml
deleted file mode 100644
index 33a89bd..0000000
--- a/docs/api/tmpl/base/buffer.sgml
+++ /dev/null
@@ -1,232 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-buffer
-
-<!-- ##### SECTION Short_Description ##### -->
-Binary buffer implementation.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Binary buffer implementation.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM xmlSecAllocMode ##### -->
-<para>
-
-</para>
-
-@xmlSecAllocModeExact:
-@xmlSecAllocModeDouble:
-
-<!-- ##### STRUCT xmlSecBuffer ##### -->
-<para>
-
-</para>
-
-@data:
-@size:
-@maxSize:
-@allocMode:
-
-<!-- ##### FUNCTION xmlSecBufferSetDefaultAllocMode ##### -->
-<para>
-
-</para>
-
-@defAllocMode:
-@defInitialSize:
-
-
-<!-- ##### FUNCTION xmlSecBufferCreate ##### -->
-<para>
-
-</para>
-
-@size:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBufferDestroy ##### -->
-<para>
-
-</para>
-
-@buf:
-
-
-<!-- ##### FUNCTION xmlSecBufferInitialize ##### -->
-<para>
-
-</para>
-
-@buf:
-@size:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBufferFinalize ##### -->
-<para>
-
-</para>
-
-@buf:
-
-
-<!-- ##### FUNCTION xmlSecBufferGetData ##### -->
-<para>
-
-</para>
-
-@buf:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBufferSetData ##### -->
-<para>
-
-</para>
-
-@buf:
-@data:
-@size:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBufferGetSize ##### -->
-<para>
-
-</para>
-
-@buf:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBufferSetSize ##### -->
-<para>
-
-</para>
-
-@buf:
-@size:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBufferGetMaxSize ##### -->
-<para>
-
-</para>
-
-@buf:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBufferSetMaxSize ##### -->
-<para>
-
-</para>
-
-@buf:
-@size:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBufferEmpty ##### -->
-<para>
-
-</para>
-
-@buf:
-
-
-<!-- ##### FUNCTION xmlSecBufferAppend ##### -->
-<para>
-
-</para>
-
-@buf:
-@data:
-@size:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBufferPrepend ##### -->
-<para>
-
-</para>
-
-@buf:
-@data:
-@size:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBufferRemoveHead ##### -->
-<para>
-
-</para>
-
-@buf:
-@size:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBufferRemoveTail ##### -->
-<para>
-
-</para>
-
-@buf:
-@size:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBufferReadFile ##### -->
-<para>
-
-</para>
-
-@buf:
-@filename:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBufferBase64NodeContentRead ##### -->
-<para>
-
-</para>
-
-@buf:
-@node:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBufferBase64NodeContentWrite ##### -->
-<para>
-
-</para>
-
-@buf:
-@node:
-@columns:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecBufferCreateOutputBuffer ##### -->
-<para>
-
-</para>
-
-@buf:
-@Returns:
-
-
diff --git a/docs/api/tmpl/base/dl.sgml b/docs/api/tmpl/base/dl.sgml
deleted file mode 100644
index 88ca820..0000000
--- a/docs/api/tmpl/base/dl.sgml
+++ /dev/null
@@ -1,94 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-dl
-
-<!-- ##### SECTION Short_Description ##### -->
-Dynamic crypto-engine library loading support.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Dynamic crypto-engine library loading support.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms ##### -->
-<para>
-
-</para>
-
-@functions:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoDLInit ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoDLShutdown ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoDLLoadLibrary ##### -->
-<para>
-
-</para>
-
-@crypto:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoDLGetLibraryFunctions ##### -->
-<para>
-
-</para>
-
-@crypto:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoDLUnloadLibrary ##### -->
-<para>
-
-</para>
-
-@crypto:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoDLSetFunctions ##### -->
-<para>
-
-</para>
-
-@functions:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecCryptoDLGetFunctions ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
diff --git a/docs/api/tmpl/base/errors.sgml b/docs/api/tmpl/base/errors.sgml
deleted file mode 100644
index 7dea2cb..0000000
--- a/docs/api/tmpl/base/errors.sgml
+++ /dev/null
@@ -1,504 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-errors
-
-<!-- ##### SECTION Short_Description ##### -->
-Error/log messages support.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Error/log messages support.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_XMLSEC_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_MALLOC_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_STRDUP_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_CRYPTO_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_XML_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_XSLT_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_IO_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_DISABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_NOT_IMPLEMENTED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_INVALID_CONFIG ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_INVALID_SIZE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_INVALID_DATA ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_INVALID_RESULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_INVALID_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_INVALID_OPERATION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_INVALID_STATUS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_INVALID_FORMAT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_DATA_NOT_MATCH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_INVALID_VERSION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_INVALID_NODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_INVALID_NODE_CONTENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_UNEXPECTED_NODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_NODE_NOT_FOUND ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_INVALID_TRANSFORM ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_INVALID_URI_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_TRANSFORM_DISABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_INVALID_KEY_DATA ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_KEY_NOT_FOUND ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_KEYDATA_DISABLED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_CERT_VERIFY_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_CERT_NOT_FOUND ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_CERT_REVOKED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_CERT_ISSUER_FAILED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_CERT_NOT_YET_VALID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_CERT_HAS_EXPIRED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_DSIG_NO_REFERENCES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_R_ASSERTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_MAX_NUMBER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### USER_FUNCTION xmlSecErrorsCallback ##### -->
-<para>
-
-</para>
-
-@file:
-@line:
-@func:
-@errorObject:
-@errorSubject:
-@reason:
-@msg:
-
-
-<!-- ##### FUNCTION xmlSecErrorsInit ##### -->
-<para>
-
-</para>
-
-@void:
-
-
-<!-- ##### FUNCTION xmlSecErrorsShutdown ##### -->
-<para>
-
-</para>
-
-@void:
-
-
-<!-- ##### FUNCTION xmlSecErrorsSetCallback ##### -->
-<para>
-
-</para>
-
-@callback:
-
-
-<!-- ##### FUNCTION xmlSecErrorsDefaultCallback ##### -->
-<para>
-
-</para>
-
-@file:
-@line:
-@func:
-@errorObject:
-@errorSubject:
-@reason:
-@msg:
-
-
-<!-- ##### FUNCTION xmlSecErrorsDefaultCallbackEnableOutput ##### -->
-<para>
-
-</para>
-
-@enabled:
-
-
-<!-- ##### FUNCTION xmlSecErrorsGetCode ##### -->
-<para>
-
-</para>
-
-@pos:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecErrorsGetMsg ##### -->
-<para>
-
-</para>
-
-@pos:
-@Returns:
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_HERE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecErrorsSafeString ##### -->
-<para>
-
-</para>
-
-@str:
-
-
-<!-- ##### MACRO XMLSEC_ERRORS_NO_MESSAGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecError ##### -->
-<para>
-
-</para>
-
-@file:
-@line:
-@func:
-@errorObject:
-@errorSubject:
-@reason:
-@msg:
-@...:
-
-
-<!-- ##### MACRO xmlSecAssert ##### -->
-<para>
-
-</para>
-
-@p:
-
-
-<!-- ##### MACRO xmlSecAssert2 ##### -->
-<para>
-
-</para>
-
-@p:
-@ret:
-
-
diff --git a/docs/api/tmpl/base/exports.sgml b/docs/api/tmpl/base/exports.sgml
deleted file mode 100644
index f4d396d..0000000
--- a/docs/api/tmpl/base/exports.sgml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-exports
-
-<!-- ##### SECTION Short_Description ##### -->
-Black magic to export functions on Windows.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Black magic to export functions on Windows.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO extern ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/docs/api/tmpl/base/io.sgml b/docs/api/tmpl/base/io.sgml
deleted file mode 100644
index 494ae00..0000000
--- a/docs/api/tmpl/base/io.sgml
+++ /dev/null
@@ -1,103 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-io
-
-<!-- ##### SECTION Short_Description ##### -->
-Input/output support.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Input/output support.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION xmlSecIOInit ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecIOShutdown ##### -->
-<para>
-
-</para>
-
-@void:
-
-
-<!-- ##### FUNCTION xmlSecIOCleanupCallbacks ##### -->
-<para>
-
-</para>
-
-@void:
-
-
-<!-- ##### FUNCTION xmlSecIORegisterDefaultCallbacks ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecIORegisterCallbacks ##### -->
-<para>
-
-</para>
-
-@matchFunc:
-@openFunc:
-@readFunc:
-@closeFunc:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecTransformInputURIId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformInputURIGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecTransformInputURIOpen ##### -->
-<para>
-
-</para>
-
-@transform:
-@uri:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecTransformInputURIClose ##### -->
-<para>
-
-</para>
-
-@transform:
-@Returns:
-
-
diff --git a/docs/api/tmpl/base/keyinfo.sgml b/docs/api/tmpl/base/keyinfo.sgml
deleted file mode 100644
index e6ea391..0000000
--- a/docs/api/tmpl/base/keyinfo.sgml
+++ /dev/null
@@ -1,312 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-keyinfo
-
-<!-- ##### SECTION Short_Description ##### -->
-&lt;dsig:KeyInfo/&gt; node parser.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-&lt;dsig:KeyInfo/&gt; node parser.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION xmlSecKeyInfoNodeRead ##### -->
-<para>
-
-</para>
-
-@keyInfoNode:
-@key:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyInfoNodeWrite ##### -->
-<para>
-
-</para>
-
-@keyInfoNode:
-@key:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### ENUM xmlSecKeyInfoMode ##### -->
-<para>
-
-</para>
-
-@xmlSecKeyInfoModeRead:
-@xmlSecKeyInfoModeWrite:
-
-<!-- ##### MACRO XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT xmlSecKeyInfoCtx ##### -->
-<para>
-
-</para>
-
-@userData:
-@flags:
-@flags2:
-@keysMngr:
-@mode:
-@enabledKeyData:
-@base64LineSize:
-@retrievalMethodCtx:
-@maxRetrievalMethodLevel:
-@encCtx:
-@maxEncryptedKeyLevel:
-@certsVerificationTime:
-@certsVerificationDepth:
-@pgpReserved:
-@curRetrievalMethodLevel:
-@curEncryptedKeyLevel:
-@keyReq:
-@reserved0:
-@reserved1:
-
-<!-- ##### FUNCTION xmlSecKeyInfoCtxCreate ##### -->
-<para>
-
-</para>
-
-@keysMngr:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyInfoCtxDestroy ##### -->
-<para>
-
-</para>
-
-@keyInfoCtx:
-
-
-<!-- ##### FUNCTION xmlSecKeyInfoCtxInitialize ##### -->
-<para>
-
-</para>
-
-@keyInfoCtx:
-@keysMngr:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyInfoCtxFinalize ##### -->
-<para>
-
-</para>
-
-@keyInfoCtx:
-
-
-<!-- ##### FUNCTION xmlSecKeyInfoCtxReset ##### -->
-<para>
-
-</para>
-
-@keyInfoCtx:
-
-
-<!-- ##### FUNCTION xmlSecKeyInfoCtxCopyUserPref ##### -->
-<para>
-
-</para>
-
-@dst:
-@src:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyInfoCtxCreateEncCtx ##### -->
-<para>
-
-</para>
-
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyInfoCtxDebugDump ##### -->
-<para>
-
-</para>
-
-@keyInfoCtx:
-@output:
-
-
-<!-- ##### FUNCTION xmlSecKeyInfoCtxDebugXmlDump ##### -->
-<para>
-
-</para>
-
-@keyInfoCtx:
-@output:
-
-
-<!-- ##### MACRO xmlSecKeyDataNameId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataNameGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyDataValueId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataValueGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyDataRetrievalMethodId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataRetrievalMethodGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyDataEncryptedKeyId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataEncryptedKeyGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
diff --git a/docs/api/tmpl/base/keys.sgml b/docs/api/tmpl/base/keys.sgml
deleted file mode 100644
index 7bd74cf..0000000
--- a/docs/api/tmpl/base/keys.sgml
+++ /dev/null
@@ -1,521 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-keys
-
-<!-- ##### SECTION Short_Description ##### -->
-Crypto key object definition.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Crypto key object definition.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### TYPEDEF xmlSecKeyUsage ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO xmlSecKeyUsageSign ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyUsageVerify ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyUsageEncrypt ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyUsageDecrypt ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyUsageKeyExchange ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyUsageAny ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyUseWithInitialize ##### -->
-<para>
-
-</para>
-
-@keyUseWith:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyUseWithFinalize ##### -->
-<para>
-
-</para>
-
-@keyUseWith:
-
-
-<!-- ##### FUNCTION xmlSecKeyUseWithReset ##### -->
-<para>
-
-</para>
-
-@keyUseWith:
-
-
-<!-- ##### FUNCTION xmlSecKeyUseWithCopy ##### -->
-<para>
-
-</para>
-
-@dst:
-@src:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyUseWithCreate ##### -->
-<para>
-
-</para>
-
-@application:
-@identifier:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyUseWithDuplicate ##### -->
-<para>
-
-</para>
-
-@keyUseWith:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyUseWithDestroy ##### -->
-<para>
-
-</para>
-
-@keyUseWith:
-
-
-<!-- ##### FUNCTION xmlSecKeyUseWithSet ##### -->
-<para>
-
-</para>
-
-@keyUseWith:
-@application:
-@identifier:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyUseWithDebugDump ##### -->
-<para>
-
-</para>
-
-@keyUseWith:
-@output:
-
-
-<!-- ##### FUNCTION xmlSecKeyUseWithDebugXmlDump ##### -->
-<para>
-
-</para>
-
-@keyUseWith:
-@output:
-
-
-<!-- ##### STRUCT xmlSecKeyUseWith ##### -->
-<para>
-
-</para>
-
-@application:
-@identifier:
-@reserved1:
-@reserved2:
-
-<!-- ##### MACRO xmlSecKeyUseWithPtrListId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyUseWithPtrListGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### STRUCT xmlSecKeyReq ##### -->
-<para>
-
-</para>
-
-@keyId:
-@keyType:
-@keyUsage:
-@keyBitsSize:
-@keyUseWithList:
-@reserved1:
-@reserved2:
-
-<!-- ##### FUNCTION xmlSecKeyReqInitialize ##### -->
-<para>
-
-</para>
-
-@keyReq:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyReqFinalize ##### -->
-<para>
-
-</para>
-
-@keyReq:
-
-
-<!-- ##### FUNCTION xmlSecKeyReqReset ##### -->
-<para>
-
-</para>
-
-@keyReq:
-
-
-<!-- ##### FUNCTION xmlSecKeyReqCopy ##### -->
-<para>
-
-</para>
-
-@dst:
-@src:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyReqMatchKey ##### -->
-<para>
-
-</para>
-
-@keyReq:
-@key:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyReqMatchKeyValue ##### -->
-<para>
-
-</para>
-
-@keyReq:
-@value:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyReqDebugDump ##### -->
-<para>
-
-</para>
-
-@keyReq:
-@output:
-
-
-<!-- ##### FUNCTION xmlSecKeyReqDebugXmlDump ##### -->
-<para>
-
-</para>
-
-@keyReq:
-@output:
-
-
-<!-- ##### STRUCT xmlSecKey ##### -->
-<para>
-
-</para>
-
-@name:
-@value:
-@dataList:
-@usage:
-@notValidBefore:
-@notValidAfter:
-
-<!-- ##### FUNCTION xmlSecKeyCreate ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDestroy ##### -->
-<para>
-
-</para>
-
-@key:
-
-
-<!-- ##### FUNCTION xmlSecKeyEmpty ##### -->
-<para>
-
-</para>
-
-@key:
-
-
-<!-- ##### FUNCTION xmlSecKeyDuplicate ##### -->
-<para>
-
-</para>
-
-@key:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyCopy ##### -->
-<para>
-
-</para>
-
-@keyDst:
-@keySrc:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyGetName ##### -->
-<para>
-
-</para>
-
-@key:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeySetName ##### -->
-<para>
-
-</para>
-
-@key:
-@name:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyGetType ##### -->
-<para>
-
-</para>
-
-@key:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyGetValue ##### -->
-<para>
-
-</para>
-
-@key:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeySetValue ##### -->
-<para>
-
-</para>
-
-@key:
-@value:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyGetData ##### -->
-<para>
-
-</para>
-
-@key:
-@dataId:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyEnsureData ##### -->
-<para>
-
-</para>
-
-@key:
-@dataId:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyAdoptData ##### -->
-<para>
-
-</para>
-
-@key:
-@data:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDebugDump ##### -->
-<para>
-
-</para>
-
-@key:
-@output:
-
-
-<!-- ##### FUNCTION xmlSecKeyDebugXmlDump ##### -->
-<para>
-
-</para>
-
-@key:
-@output:
-
-
-<!-- ##### FUNCTION xmlSecKeyGenerate ##### -->
-<para>
-
-</para>
-
-@dataId:
-@sizeBits:
-@type:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyGenerateByName ##### -->
-<para>
-
-</para>
-
-@name:
-@sizeBits:
-@type:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyMatch ##### -->
-<para>
-
-</para>
-
-@key:
-@name:
-@keyReq:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyReadBuffer ##### -->
-<para>
-
-</para>
-
-@dataId:
-@buffer:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyReadBinaryFile ##### -->
-<para>
-
-</para>
-
-@dataId:
-@filename:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyReadMemory ##### -->
-<para>
-
-</para>
-
-@dataId:
-@data:
-@dataSize:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyIsValid ##### -->
-<para>
-
-</para>
-
-@key:
-
-
-<!-- ##### MACRO xmlSecKeyCheckId ##### -->
-<para>
-
-</para>
-
-@key:
-@keyId:
-
-
-<!-- ##### MACRO xmlSecKeyPtrListId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyPtrListGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
diff --git a/docs/api/tmpl/base/keysdata.sgml b/docs/api/tmpl/base/keysdata.sgml
deleted file mode 100644
index 3260521..0000000
--- a/docs/api/tmpl/base/keysdata.sgml
+++ /dev/null
@@ -1,930 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-keysdata
-
-<!-- ##### SECTION Short_Description ##### -->
-Crypto key data object definition.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Crypto key data object definition.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### TYPEDEF xmlSecKeyDataUsage ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO xmlSecKeyDataUsageUnknown ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataUsageKeyInfoNodeRead ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataUsageKeyInfoNodeWrite ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataUsageKeyValueNodeRead ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataUsageKeyValueNodeWrite ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataUsageRetrievalMethodNodeXml ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataUsageRetrievalMethodNodeBin ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataUsageAny ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataUsageKeyInfoNode ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataUsageKeyValueNode ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataUsageRetrievalMethodNode ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### TYPEDEF xmlSecKeyDataType ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO xmlSecKeyDataTypeUnknown ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataTypeNone ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataTypePublic ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataTypePrivate ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataTypeSymmetric ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataTypeSession ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataTypePermanent ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataTypeTrusted ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO xmlSecKeyDataTypeAny ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM xmlSecKeyDataFormat ##### -->
-<para>
-
-</para>
-
-@xmlSecKeyDataFormatUnknown:
-@xmlSecKeyDataFormatBinary:
-@xmlSecKeyDataFormatPem:
-@xmlSecKeyDataFormatDer:
-@xmlSecKeyDataFormatPkcs8Pem:
-@xmlSecKeyDataFormatPkcs8Der:
-@xmlSecKeyDataFormatPkcs12:
-@xmlSecKeyDataFormatCertPem:
-@xmlSecKeyDataFormatCertDer:
-
-<!-- ##### FUNCTION xmlSecKeyDataIdsGet ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataIdsInit ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataIdsShutdown ##### -->
-<para>
-
-</para>
-
-@void:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataIdsRegisterDefault ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataIdsRegister ##### -->
-<para>
-
-</para>
-
-@id:
-@Returns:
-
-
-<!-- ##### STRUCT xmlSecKeyData ##### -->
-<para>
-
-</para>
-
-@id:
-@reserved0:
-@reserved1:
-
-<!-- ##### FUNCTION xmlSecKeyDataCreate ##### -->
-<para>
-
-</para>
-
-@id:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataDuplicate ##### -->
-<para>
-
-</para>
-
-@data:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataDestroy ##### -->
-<para>
-
-</para>
-
-@data:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataGenerate ##### -->
-<para>
-
-</para>
-
-@data:
-@sizeBits:
-@type:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataGetType ##### -->
-<para>
-
-</para>
-
-@data:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataGetSize ##### -->
-<para>
-
-</para>
-
-@data:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataGetIdentifier ##### -->
-<para>
-
-</para>
-
-@data:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataDebugDump ##### -->
-<para>
-
-</para>
-
-@data:
-@output:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataDebugXmlDump ##### -->
-<para>
-
-</para>
-
-@data:
-@output:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataXmlRead ##### -->
-<para>
-
-</para>
-
-@id:
-@key:
-@node:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataXmlWrite ##### -->
-<para>
-
-</para>
-
-@id:
-@key:
-@node:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataBinRead ##### -->
-<para>
-
-</para>
-
-@id:
-@key:
-@buf:
-@bufSize:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataBinWrite ##### -->
-<para>
-
-</para>
-
-@id:
-@key:
-@buf:
-@bufSize:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyDataGetName ##### -->
-<para>
-
-</para>
-
-@data:
-
-
-<!-- ##### MACRO xmlSecKeyDataIsValid ##### -->
-<para>
-
-</para>
-
-@data:
-
-
-<!-- ##### MACRO xmlSecKeyDataCheckId ##### -->
-<para>
-
-</para>
-
-@data:
-@dataId:
-
-
-<!-- ##### MACRO xmlSecKeyDataCheckUsage ##### -->
-<para>
-
-</para>
-
-@data:
-@usg:
-
-
-<!-- ##### MACRO xmlSecKeyDataCheckSize ##### -->
-<para>
-
-</para>
-
-@data:
-@size:
-
-
-<!-- ##### MACRO xmlSecKeyDataIdUnknown ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### USER_FUNCTION xmlSecKeyDataInitMethod ##### -->
-<para>
-
-</para>
-
-@data:
-@Returns:
-
-
-<!-- ##### USER_FUNCTION xmlSecKeyDataDuplicateMethod ##### -->
-<para>
-
-</para>
-
-@dst:
-@src:
-@Returns:
-
-
-<!-- ##### USER_FUNCTION xmlSecKeyDataFinalizeMethod ##### -->
-<para>
-
-</para>
-
-@data:
-
-
-<!-- ##### USER_FUNCTION xmlSecKeyDataXmlReadMethod ##### -->
-<para>
-
-</para>
-
-@id:
-@key:
-@node:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### USER_FUNCTION xmlSecKeyDataXmlWriteMethod ##### -->
-<para>
-
-</para>
-
-@id:
-@key:
-@node:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### USER_FUNCTION xmlSecKeyDataBinReadMethod ##### -->
-<para>
-
-</para>
-
-@id:
-@key:
-@buf:
-@bufSize:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### USER_FUNCTION xmlSecKeyDataBinWriteMethod ##### -->
-<para>
-
-</para>
-
-@id:
-@key:
-@buf:
-@bufSize:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### USER_FUNCTION xmlSecKeyDataGenerateMethod ##### -->
-<para>
-
-</para>
-
-@data:
-@sizeBits:
-@type:
-@Returns:
-
-
-<!-- ##### USER_FUNCTION xmlSecKeyDataGetTypeMethod ##### -->
-<para>
-
-</para>
-
-@data:
-@Returns:
-
-
-<!-- ##### USER_FUNCTION xmlSecKeyDataGetSizeMethod ##### -->
-<para>
-
-</para>
-
-@data:
-@Returns:
-
-
-<!-- ##### USER_FUNCTION xmlSecKeyDataGetIdentifierMethod ##### -->
-<para>
-
-</para>
-
-@data:
-@Returns:
-
-
-<!-- ##### USER_FUNCTION xmlSecKeyDataDebugDumpMethod ##### -->
-<para>
-
-</para>
-
-@data:
-@output:
-
-
-<!-- ##### STRUCT xmlSecKeyDataKlass ##### -->
-<para>
-
-</para>
-
-@klassSize:
-@objSize:
-@name:
-@usage:
-@href:
-@dataNodeName:
-@dataNodeNs:
-@initialize:
-@duplicate:
-@finalize:
-@generate:
-@getType:
-@getSize:
-@getIdentifier:
-@xmlRead:
-@xmlWrite:
-@binRead:
-@binWrite:
-@debugDump:
-@debugXmlDump:
-@reserved0:
-@reserved1:
-
-<!-- ##### MACRO xmlSecKeyDataKlassGetName ##### -->
-<para>
-
-</para>
-
-@klass:
-
-
-<!-- ##### MACRO xmlSecKeyDataListId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataListGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyDataIdListId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataIdListGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataIdListFind ##### -->
-<para>
-
-</para>
-
-@list:
-@dataId:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataIdListFindByNode ##### -->
-<para>
-
-</para>
-
-@list:
-@nodeName:
-@nodeNs:
-@usage:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataIdListFindByHref ##### -->
-<para>
-
-</para>
-
-@list:
-@href:
-@usage:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataIdListFindByName ##### -->
-<para>
-
-</para>
-
-@list:
-@name:
-@usage:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataIdListDebugDump ##### -->
-<para>
-
-</para>
-
-@list:
-@output:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataIdListDebugXmlDump ##### -->
-<para>
-
-</para>
-
-@list:
-@output:
-
-
-<!-- ##### MACRO xmlSecKeyDataBinarySize ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataBinaryValueInitialize ##### -->
-<para>
-
-</para>
-
-@data:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataBinaryValueDuplicate ##### -->
-<para>
-
-</para>
-
-@dst:
-@src:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataBinaryValueFinalize ##### -->
-<para>
-
-</para>
-
-@data:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataBinaryValueXmlRead ##### -->
-<para>
-
-</para>
-
-@id:
-@key:
-@node:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataBinaryValueXmlWrite ##### -->
-<para>
-
-</para>
-
-@id:
-@key:
-@node:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataBinaryValueBinRead ##### -->
-<para>
-
-</para>
-
-@id:
-@key:
-@buf:
-@bufSize:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataBinaryValueBinWrite ##### -->
-<para>
-
-</para>
-
-@id:
-@key:
-@buf:
-@bufSize:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataBinaryValueDebugDump ##### -->
-<para>
-
-</para>
-
-@data:
-@output:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataBinaryValueDebugXmlDump ##### -->
-<para>
-
-</para>
-
-@data:
-@output:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataBinaryValueGetSize ##### -->
-<para>
-
-</para>
-
-@data:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataBinaryValueGetBuffer ##### -->
-<para>
-
-</para>
-
-@data:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataBinaryValueSetBuffer ##### -->
-<para>
-
-</para>
-
-@data:
-@buf:
-@bufSize:
-@Returns:
-
-
-<!-- ##### STRUCT xmlSecKeyDataStore ##### -->
-<para>
-
-</para>
-
-@id:
-@reserved0:
-@reserved1:
-
-<!-- ##### FUNCTION xmlSecKeyDataStoreCreate ##### -->
-<para>
-
-</para>
-
-@id:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyDataStoreDestroy ##### -->
-<para>
-
-</para>
-
-@store:
-
-
-<!-- ##### MACRO xmlSecKeyDataStoreGetName ##### -->
-<para>
-
-</para>
-
-@store:
-
-
-<!-- ##### MACRO xmlSecKeyDataStoreIsValid ##### -->
-<para>
-
-</para>
-
-@store:
-
-
-<!-- ##### MACRO xmlSecKeyDataStoreCheckId ##### -->
-<para>
-
-</para>
-
-@store:
-@storeId:
-
-
-<!-- ##### MACRO xmlSecKeyDataStoreCheckSize ##### -->
-<para>
-
-</para>
-
-@store:
-@size:
-
-
-<!-- ##### MACRO xmlSecKeyDataStoreIdUnknown ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### USER_FUNCTION xmlSecKeyDataStoreInitializeMethod ##### -->
-<para>
-
-</para>
-
-@store:
-@Returns:
-
-
-<!-- ##### USER_FUNCTION xmlSecKeyDataStoreFinalizeMethod ##### -->
-<para>
-
-</para>
-
-@store:
-
-
-<!-- ##### STRUCT xmlSecKeyDataStoreKlass ##### -->
-<para>
-
-</para>
-
-@klassSize:
-@objSize:
-@name:
-@initialize:
-@finalize:
-@reserved0:
-@reserved1:
-
-<!-- ##### MACRO xmlSecKeyDataStoreKlassGetName ##### -->
-<para>
-
-</para>
-
-@klass:
-
-
-<!-- ##### MACRO xmlSecKeyDataStorePtrListId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecKeyDataStorePtrListGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
diff --git a/docs/api/tmpl/base/keysmngr.sgml b/docs/api/tmpl/base/keysmngr.sgml
deleted file mode 100644
index 6f55ffa..0000000
--- a/docs/api/tmpl/base/keysmngr.sgml
+++ /dev/null
@@ -1,303 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-keysmngr
-
-<!-- ##### SECTION Short_Description ##### -->
-Keys manager object support.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Keys manager object support.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION xmlSecKeysMngrCreate ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeysMngrDestroy ##### -->
-<para>
-
-</para>
-
-@mngr:
-
-
-<!-- ##### FUNCTION xmlSecKeysMngrFindKey ##### -->
-<para>
-
-</para>
-
-@mngr:
-@name:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeysMngrAdoptKeysStore ##### -->
-<para>
-
-</para>
-
-@mngr:
-@store:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeysMngrGetKeysStore ##### -->
-<para>
-
-</para>
-
-@mngr:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeysMngrAdoptDataStore ##### -->
-<para>
-
-</para>
-
-@mngr:
-@store:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeysMngrGetDataStore ##### -->
-<para>
-
-</para>
-
-@mngr:
-@id:
-@Returns:
-
-
-<!-- ##### USER_FUNCTION xmlSecGetKeyCallback ##### -->
-<para>
-
-</para>
-
-@keyInfoNode:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### STRUCT xmlSecKeysMngr ##### -->
-<para>
-
-</para>
-
-@keysStore:
-@storesList:
-@getKey:
-
-<!-- ##### FUNCTION xmlSecKeysMngrGetKey ##### -->
-<para>
-
-</para>
-
-@keyInfoNode:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### STRUCT xmlSecKeyStore ##### -->
-<para>
-
-</para>
-
-@id:
-@reserved0:
-@reserved1:
-
-<!-- ##### FUNCTION xmlSecKeyStoreCreate ##### -->
-<para>
-
-</para>
-
-@id:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecKeyStoreDestroy ##### -->
-<para>
-
-</para>
-
-@store:
-
-
-<!-- ##### FUNCTION xmlSecKeyStoreFindKey ##### -->
-<para>
-
-</para>
-
-@store:
-@name:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### MACRO xmlSecKeyStoreGetName ##### -->
-<para>
-
-</para>
-
-@store:
-
-
-<!-- ##### MACRO xmlSecKeyStoreIsValid ##### -->
-<para>
-
-</para>
-
-@store:
-
-
-<!-- ##### MACRO xmlSecKeyStoreCheckId ##### -->
-<para>
-
-</para>
-
-@store:
-@storeId:
-
-
-<!-- ##### MACRO xmlSecKeyStoreCheckSize ##### -->
-<para>
-
-</para>
-
-@store:
-@size:
-
-
-<!-- ##### MACRO xmlSecKeyStoreIdUnknown ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### USER_FUNCTION xmlSecKeyStoreInitializeMethod ##### -->
-<para>
-
-</para>
-
-@store:
-@Returns:
-
-
-<!-- ##### USER_FUNCTION xmlSecKeyStoreFinalizeMethod ##### -->
-<para>
-
-</para>
-
-@store:
-
-
-<!-- ##### USER_FUNCTION xmlSecKeyStoreFindKeyMethod ##### -->
-<para>
-
-</para>
-
-@store:
-@name:
-@keyInfoCtx:
-@Returns:
-
-
-<!-- ##### STRUCT xmlSecKeyStoreKlass ##### -->
-<para>
-
-</para>
-
-@klassSize:
-@objSize:
-@name:
-@initialize:
-@finalize:
-@findKey:
-@reserved0:
-@reserved1:
-
-<!-- ##### MACRO xmlSecKeyStoreKlassGetName ##### -->
-<para>
-
-</para>
-
-@klass:
-
-
-<!-- ##### MACRO xmlSecSimpleKeysStoreId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecSimpleKeysStoreGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecSimpleKeysStoreAdoptKey ##### -->
-<para>
-
-</para>
-
-@store:
-@key:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecSimpleKeysStoreLoad ##### -->
-<para>
-
-</para>
-
-@store:
-@uri:
-@keysMngr:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecSimpleKeysStoreSave ##### -->
-<para>
-
-</para>
-
-@store:
-@filename:
-@type:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecSimpleKeysStoreGetKeys ##### -->
-<para>
-
-</para>
-
-@store:
-@Returns:
-
-
diff --git a/docs/api/tmpl/base/list.sgml b/docs/api/tmpl/base/list.sgml
deleted file mode 100644
index 3d62e65..0000000
--- a/docs/api/tmpl/base/list.sgml
+++ /dev/null
@@ -1,275 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-list
-
-<!-- ##### SECTION Short_Description ##### -->
-Generic list structure implementation.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Generic list structure implementation.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT xmlSecPtrList ##### -->
-<para>
-
-</para>
-
-@id:
-@data:
-@use:
-@max:
-@allocMode:
-
-<!-- ##### FUNCTION xmlSecPtrListSetDefaultAllocMode ##### -->
-<para>
-
-</para>
-
-@defAllocMode:
-@defInitialSize:
-
-
-<!-- ##### FUNCTION xmlSecPtrListInitialize ##### -->
-<para>
-
-</para>
-
-@list:
-@id:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecPtrListFinalize ##### -->
-<para>
-
-</para>
-
-@list:
-
-
-<!-- ##### FUNCTION xmlSecPtrListCreate ##### -->
-<para>
-
-</para>
-
-@id:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecPtrListDestroy ##### -->
-<para>
-
-</para>
-
-@list:
-
-
-<!-- ##### FUNCTION xmlSecPtrListEmpty ##### -->
-<para>
-
-</para>
-
-@list:
-
-
-<!-- ##### FUNCTION xmlSecPtrListCopy ##### -->
-<para>
-
-</para>
-
-@dst:
-@src:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecPtrListDuplicate ##### -->
-<para>
-
-</para>
-
-@list:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecPtrListGetSize ##### -->
-<para>
-
-</para>
-
-@list:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecPtrListGetItem ##### -->
-<para>
-
-</para>
-
-@list:
-@pos:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecPtrListAdd ##### -->
-<para>
-
-</para>
-
-@list:
-@item:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecPtrListSet ##### -->
-<para>
-
-</para>
-
-@list:
-@item:
-@pos:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecPtrListRemove ##### -->
-<para>
-
-</para>
-
-@list:
-@pos:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecPtrListRemoveAndReturn ##### -->
-<para>
-
-</para>
-
-@list:
-@pos:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecPtrListDebugDump ##### -->
-<para>
-
-</para>
-
-@list:
-@output:
-
-
-<!-- ##### FUNCTION xmlSecPtrListDebugXmlDump ##### -->
-<para>
-
-</para>
-
-@list:
-@output:
-
-
-<!-- ##### MACRO xmlSecPtrListGetName ##### -->
-<para>
-
-</para>
-
-@list:
-
-
-<!-- ##### MACRO xmlSecPtrListIsValid ##### -->
-<para>
-
-</para>
-
-@list:
-
-
-<!-- ##### MACRO xmlSecPtrListCheckId ##### -->
-<para>
-
-</para>
-
-@list:
-@dataId:
-
-
-<!-- ##### MACRO xmlSecPtrListIdUnknown ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### USER_FUNCTION xmlSecPtrDuplicateItemMethod ##### -->
-<para>
-
-</para>
-
-@ptr:
-@Returns:
-
-
-<!-- ##### USER_FUNCTION xmlSecPtrDestroyItemMethod ##### -->
-<para>
-
-</para>
-
-@ptr:
-
-
-<!-- ##### USER_FUNCTION xmlSecPtrDebugDumpItemMethod ##### -->
-<para>
-
-</para>
-
-@ptr:
-@output:
-
-
-<!-- ##### STRUCT xmlSecPtrListKlass ##### -->
-<para>
-
-</para>
-
-@name:
-@duplicateItem:
-@destroyItem:
-@debugDumpItem:
-@debugXmlDumpItem:
-
-<!-- ##### MACRO xmlSecPtrListKlassGetName ##### -->
-<para>
-
-</para>
-
-@klass:
-
-
-<!-- ##### MACRO xmlSecStringListId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecStringListGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
diff --git a/docs/api/tmpl/base/membuf.sgml b/docs/api/tmpl/base/membuf.sgml
deleted file mode 100644
index 873eb5a..0000000
--- a/docs/api/tmpl/base/membuf.sgml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-membuf
-
-<!-- ##### SECTION Short_Description ##### -->
-Memory buffer transform implementation.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Memory buffer transform implementation.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO xmlSecTransformMemBufId ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION xmlSecTransformMemBufGetKlass ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION xmlSecTransformMemBufGetBuffer ##### -->
-<para>
-
-</para>
-
-@transform:
-@Returns:
-
-
diff --git a/docs/api/tmpl/base/nodeset.sgml b/docs/api/tmpl/base/nodeset.sgml
deleted file mode 100644
index c31c4ff..0000000
--- a/docs/api/tmpl/base/nodeset.sgml
+++ /dev/null
@@ -1,172 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-nodeset
-
-<!-- ##### SECTION Short_Description ##### -->
-Nodeset object implementation.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Nodeset object implementation.
-</para>