diff options
23 files changed, 47 insertions, 57 deletions
diff --git a/configure.in b/configure.in index 13b267a5..63c682e7 100644 --- a/configure.in +++ b/configure.in @@ -231,7 +231,7 @@ XMLSEC_NO_OPENSSL="1" OPENSSL_MIN_VERSION="0.9.6" OPENSSL_VERSION="" OPENSSL_PREFIX="" -OPENSSL_CFLAGS="-DXMLSEC_CRYPTO=\\\"openssl\\\" -DXMLSEC_CRYPTO_OPENSSL=1" +OPENSSL_CFLAGS="-DXMLSEC_CRYPTO_OPENSSL=1" OPENSSL_LIBS="" OPENSSL_LDADDS="" OPENSSL_CRYPTO_LIB="$PACKAGE-openssl" @@ -342,7 +342,7 @@ XMLSEC_NO_GNUTLS="1" GNUTLS_MIN_VERSION="0.8.1" GNUTLS_VERSION="" GNUTLS_PREFIX="" -GNUTLS_CFLAGS="-DXMLSEC_CRYPTO=\\\"gnutls\\\" -DXMLSEC_CRYPTO_GNUTLS=1" +GNUTLS_CFLAGS="-DXMLSEC_CRYPTO_GNUTLS=1" GNUTLS_LIBS="" GNUTLS_LDADDS="" GNUTLS_CRYPTO_LIB="$PACKAGE-gnutls" @@ -425,7 +425,7 @@ XMLSEC_NO_NSS="1" NSS_MIN_VERSION="3.2" MOZILLA_MIN_VERSION="1.4" NSS_VERSION="" -NSS_CFLAGS="-DXMLSEC_CRYPTO=\\\"nss\\\" -DXMLSEC_CRYPTO_NSS=1" +NSS_CFLAGS="-DXMLSEC_CRYPTO_NSS=1" NSS_LIBS="" NSS_LDADDS="" NSS_PREFIX="" diff --git a/docs/api/chapters/new-crypto.sgml b/docs/api/chapters/new-crypto.sgml index 71ae99a7..5d992add 100644 --- a/docs/api/chapters/new-crypto.sgml +++ b/docs/api/chapters/new-crypto.sgml @@ -103,7 +103,7 @@ dnl See if we can find MyCrypto dnl ========================================================================== XMLSEC_MYCRYPTO_DEFINES="" MYCRYPTO_CONFIG="mycrypto-config" # TODO -MYCRYPTO_WITHOUT="no" +XMLSEC_NO_MYCRYPTO="1" MYCRYPTO_MIN_VERSION="0.0.0" # TODO MYCRYPTO_VERSION="" MYCRYPTO_PREFIX="" @@ -113,7 +113,6 @@ MYCRYPTO_LDADDS="" AC_MSG_CHECKING(for mycrypto libraries >= $MYCRYPTO_MIN_VERSION) AC_ARG_WITH(mycrypto, [ --with-mycrypto=[PFX] mycrypto location]) if test "$with_mycrypto" = "no" ; then - MYCRYPTO_WITHOUT="yes" XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST mycrypto" AC_MSG_RESULT(no) else @@ -121,31 +120,27 @@ else MYCRYPTO_PREFIX=$with_mycrypto MYCRYPTO_CONFIG=$MYCRYPTO_PREFIX/bin/$MYCRYPTO_CONFIG fi - if ! $MYCRYPTO_CONFIG --version > /dev/null 2>&1 - then - MYCRYPTO_WITHOUT="yes" + if ! $MYCRYPTO_CONFIG --version > /dev/null 2>&1 ; then if test "$with_mycrypto" != "" ; then AC_MSG_ERROR(Unable to find mycrypto at '$with_mycrypto') fi else vers=`$MYCRYPTO_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` minvers=`echo $MYCRYPTO_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - if test "$vers" -ge "$minvers" - then + if test "$vers" -ge "$minvers" ; then MYCRYPTO_LIBS="`$MYCRYPTO_CONFIG --libs`" MYCRYPTO_CFLAGS="`$MYCRYPTO_CONFIG --cflags`" MYCRYPTO_VERSION="`$MYCRYPTO_CONFIG --version`" + XMLSEC_NO_MYCRYPTO="0" else AC_MSG_ERROR(You need at least mycrypto $MYCRYPTO_MIN_VERSION for this version of $PACKAGE) fi fi dnl update crypt libraries list - if test "$MYCRYPTO_WITHOUT" = "no" ; - then + if test "z$XMLSEC_NO_MYCRYPTO" = "z0" ; then dnl first crypto library is default one - if test "z$XMLSEC_CRYPTO" = "z" - then + if test "z$XMLSEC_CRYPTO" = "z" ; then XMLSEC_CRYPTO="mycrypto" XMLSEC_CRYPTO_LIB="xmlsec1-mycrypto" XMLSEC_CRYPTO_CFLAGS="$MYCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MYCRYPTO=1" @@ -159,7 +154,7 @@ else AC_MSG_RESULT(no) fi fi -AC_SUBST(MYCRYPTO_WITHOUT) +AC_SUBST(XMLSEC_NO_MYCRYPTO) AC_SUBST(MYCRYPTO_MIN_VERSION) AC_SUBST(MYCRYPTO_VERSION) AC_SUBST(MYCRYPTO_CONFIG) diff --git a/docs/api/xmlsec-custom-keys-manager.html b/docs/api/xmlsec-custom-keys-manager.html index ad0ee6c6..1fa2ff26 100644 --- a/docs/api/xmlsec-custom-keys-manager.html +++ b/docs/api/xmlsec-custom-keys-manager.html @@ -140,7 +140,7 @@ main(int argc, char **argv) { * xmlsec-crypto library. */ #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING - if(xmlSecCryptoDLLoadLibrary(BAD_CAST "default") < 0) { + if(xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n" "that you have it installed and check shared libraries path\n" "(LD_LIBRARY_PATH) envornment variable.\n"); diff --git a/docs/api/xmlsec-decrypt-with-keys-mngr.html b/docs/api/xmlsec-decrypt-with-keys-mngr.html index 07048b73..cbb8cdbb 100644 --- a/docs/api/xmlsec-decrypt-with-keys-mngr.html +++ b/docs/api/xmlsec-decrypt-with-keys-mngr.html @@ -137,7 +137,7 @@ main(int argc, char **argv) { * xmlsec-crypto library. */ #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING - if(xmlSecCryptoDLLoadLibrary(BAD_CAST "default") < 0) { + if(xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n" "that you have it installed and check shared libraries path\n" "(LD_LIBRARY_PATH) envornment variable.\n"); diff --git a/docs/api/xmlsec-decrypt-with-signle-key.html b/docs/api/xmlsec-decrypt-with-signle-key.html index d35019ab..c0179ab7 100644 --- a/docs/api/xmlsec-decrypt-with-signle-key.html +++ b/docs/api/xmlsec-decrypt-with-signle-key.html @@ -133,7 +133,7 @@ main(int argc, char **argv) { * xmlsec-crypto library. */ #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING - if(xmlSecCryptoDLLoadLibrary(BAD_CAST "default") < 0) { + if(xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n" "that you have it installed and check shared libraries path\n" "(LD_LIBRARY_PATH) envornment variable.\n"); diff --git a/docs/api/xmlsec-encrypt-dynamic-template.html b/docs/api/xmlsec-encrypt-dynamic-template.html index b887f340..480a9fd3 100644 --- a/docs/api/xmlsec-encrypt-dynamic-template.html +++ b/docs/api/xmlsec-encrypt-dynamic-template.html @@ -137,7 +137,7 @@ main(int argc, char **argv) { * xmlsec-crypto library. */ #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING - if(xmlSecCryptoDLLoadLibrary(BAD_CAST "default") < 0) { + if(xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n" "that you have it installed and check shared libraries path\n" "(LD_LIBRARY_PATH) envornment variable.\n"); diff --git a/docs/api/xmlsec-encrypt-template-file.html b/docs/api/xmlsec-encrypt-template-file.html index 9a6bb780..41a99d4c 100644 --- a/docs/api/xmlsec-encrypt-template-file.html +++ b/docs/api/xmlsec-encrypt-template-file.html @@ -137,7 +137,7 @@ main(int argc, char **argv) { * xmlsec-crypto library. */ #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING - if(xmlSecCryptoDLLoadLibrary(BAD_CAST "default") < 0) { + if(xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n" "that you have it installed and check shared libraries path\n" "(LD_LIBRARY_PATH) envornment variable.\n"); diff --git a/docs/api/xmlsec-encrypt-with-session-key.html b/docs/api/xmlsec-encrypt-with-session-key.html index d56eddd7..51c7b2a8 100644 --- a/docs/api/xmlsec-encrypt-with-session-key.html +++ b/docs/api/xmlsec-encrypt-with-session-key.html @@ -140,7 +140,7 @@ main(int argc, char **argv) { * xmlsec-crypto library. */ #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING - if(xmlSecCryptoDLLoadLibrary(BAD_CAST "default") < 0) { + if(xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n" "that you have it installed and check shared libraries path\n" "(LD_LIBRARY_PATH) envornment variable.\n"); diff --git a/docs/api/xmlsec-examples-sign-dynamimc-template.html b/docs/api/xmlsec-examples-sign-dynamimc-template.html index 741be24d..25c207cd 100644 --- a/docs/api/xmlsec-examples-sign-dynamimc-template.html +++ b/docs/api/xmlsec-examples-sign-dynamimc-template.html @@ -138,7 +138,7 @@ main(int argc, char **argv) { * xmlsec-crypto library. */ #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING - if(xmlSecCryptoDLLoadLibrary(BAD_CAST "default") < 0) { + if(xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n" "that you have it installed and check shared libraries path\n" "(LD_LIBRARY_PATH) envornment variable.\n"); diff --git a/docs/api/xmlsec-examples-sign-template-file.html b/docs/api/xmlsec-examples-sign-template-file.html index 8e1a00be..bdc3abf9 100644 --- a/docs/api/xmlsec-examples-sign-template-file.html +++ b/docs/api/xmlsec-examples-sign-template-file.html @@ -135,7 +135,7 @@ main(int argc, char **argv) { * xmlsec-crypto library. */ #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING - if(xmlSecCryptoDLLoadLibrary(BAD_CAST "default") < 0) { + if(xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n" "that you have it installed and check shared libraries path\n" "(LD_LIBRARY_PATH) envornment variable.\n"); diff --git a/docs/api/xmlsec-examples-sign-x509.html b/docs/api/xmlsec-examples-sign-x509.html index bc92361b..315cd83b 100644 --- a/docs/api/xmlsec-examples-sign-x509.html +++ b/docs/api/xmlsec-examples-sign-x509.html @@ -142,7 +142,7 @@ main(int argc, char **argv) { * xmlsec-crypto library. */ #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING - if(xmlSecCryptoDLLoadLibrary(BAD_CAST "default") < 0) { + if(xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n" "that you have it installed and check shared libraries path\n" "(LD_LIBRARY_PATH) envornment variable.\n"); diff --git a/docs/api/xmlsec-notes-init-shutdown.html b/docs/api/xmlsec-notes-init-shutdown.html index 48eb2e4f..1dfd9f13 100644 --- a/docs/api/xmlsec-notes-init-shutdown.html +++ b/docs/api/xmlsec-notes-init-shutdown.html @@ -111,7 +111,7 @@ * xmlsec-crypto library. */ #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING - if(xmlSecCryptoDLLoadLibrary(BAD_CAST "default") < 0) { + if(xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n" "that you have it installed and check shared libraries path\n" "(LD_LIBRARY_PATH) envornment variable.\n"); diff --git a/docs/api/xmlsec-notes-new-crypto-skeleton.html b/docs/api/xmlsec-notes-new-crypto-skeleton.html index e0588cdd..803fdd05 100644 --- a/docs/api/xmlsec-notes-new-crypto-skeleton.html +++ b/docs/api/xmlsec-notes-new-crypto-skeleton.html @@ -131,7 +131,7 @@ dnl See if we can find MyCrypto dnl ========================================================================== XMLSEC_MYCRYPTO_DEFINES="" MYCRYPTO_CONFIG="mycrypto-config" # TODO -MYCRYPTO_WITHOUT="no" +XMLSEC_NO_MYCRYPTO="1" MYCRYPTO_MIN_VERSION="0.0.0" # TODO MYCRYPTO_VERSION="" MYCRYPTO_PREFIX="" @@ -141,7 +141,6 @@ MYCRYPTO_LDADDS="" AC_MSG_CHECKING(for mycrypto libraries >= $MYCRYPTO_MIN_VERSION) AC_ARG_WITH(mycrypto, [ --with-mycrypto=[PFX] mycrypto location]) if test "$with_mycrypto" = "no" ; then - MYCRYPTO_WITHOUT="yes" XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST mycrypto" AC_MSG_RESULT(no) else @@ -149,31 +148,27 @@ else MYCRYPTO_PREFIX=$with_mycrypto MYCRYPTO_CONFIG=$MYCRYPTO_PREFIX/bin/$MYCRYPTO_CONFIG fi - if ! $MYCRYPTO_CONFIG --version > /dev/null 2>&1 - then - MYCRYPTO_WITHOUT="yes" + if ! $MYCRYPTO_CONFIG --version > /dev/null 2>&1 ; then if test "$with_mycrypto" != "" ; then AC_MSG_ERROR(Unable to find mycrypto at '$with_mycrypto') fi else vers=`$MYCRYPTO_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` minvers=`echo $MYCRYPTO_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - if test "$vers" -ge "$minvers" - then + if test "$vers" -ge "$minvers" ; then MYCRYPTO_LIBS="`$MYCRYPTO_CONFIG --libs`" MYCRYPTO_CFLAGS="`$MYCRYPTO_CONFIG --cflags`" MYCRYPTO_VERSION="`$MYCRYPTO_CONFIG --version`" + XMLSEC_NO_MYCRYPTO="0" else AC_MSG_ERROR(You need at least mycrypto $MYCRYPTO_MIN_VERSION for this version of $PACKAGE) fi fi dnl update crypt libraries list - if test "$MYCRYPTO_WITHOUT" = "no" ; - then + if test "z$XMLSEC_NO_MYCRYPTO" = "z0" ; then dnl first crypto library is default one - if test "z$XMLSEC_CRYPTO" = "z" - then + if test "z$XMLSEC_CRYPTO" = "z" ; then XMLSEC_CRYPTO="mycrypto" XMLSEC_CRYPTO_LIB="xmlsec1-mycrypto" XMLSEC_CRYPTO_CFLAGS="$MYCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MYCRYPTO=1" @@ -187,7 +182,7 @@ else AC_MSG_RESULT(no) fi fi -AC_SUBST(MYCRYPTO_WITHOUT) +AC_SUBST(XMLSEC_NO_MYCRYPTO) AC_SUBST(MYCRYPTO_MIN_VERSION) AC_SUBST(MYCRYPTO_VERSION) AC_SUBST(MYCRYPTO_CONFIG) diff --git a/docs/api/xmlsec-verify-with-key.html b/docs/api/xmlsec-verify-with-key.html index 8ef48138..3a265dcb 100644 --- a/docs/api/xmlsec-verify-with-key.html +++ b/docs/api/xmlsec-verify-with-key.html @@ -133,7 +133,7 @@ main(int argc, char **argv) { * xmlsec-crypto library. */ #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING - if(xmlSecCryptoDLLoadLibrary(BAD_CAST "default") < 0) { + if(xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n" "that you have it installed and check shared libraries path\n" "(LD_LIBRARY_PATH) envornment variable.\n"); diff --git a/docs/api/xmlsec-verify-with-keys-mngr.html b/docs/api/xmlsec-verify-with-keys-mngr.html index 4779911d..1556f9cc 100644 --- a/docs/api/xmlsec-verify-with-keys-mngr.html +++ b/docs/api/xmlsec-verify-with-keys-mngr.html @@ -136,7 +136,7 @@ main(int argc, char **argv) { * xmlsec-crypto library. */ #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING - if(xmlSecCryptoDLLoadLibrary(BAD_CAST "default") < 0) { + if(xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n" "that you have it installed and check shared libraries path\n" "(LD_LIBRARY_PATH) envornment variable.\n"); diff --git a/docs/api/xmlsec-verify-with-restrictions.html b/docs/api/xmlsec-verify-with-restrictions.html index bc6f290e..6c376a4f 100644 --- a/docs/api/xmlsec-verify-with-restrictions.html +++ b/docs/api/xmlsec-verify-with-restrictions.html @@ -146,7 +146,7 @@ main(int argc, char **argv) { * xmlsec-crypto library. */ #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING - if(xmlSecCryptoDLLoadLibrary(BAD_CAST "default") < 0) { + if(xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n" "that you have it installed and check shared libraries path\n" "(LD_LIBRARY_PATH) envornment variable.\n"); diff --git a/docs/api/xmlsec-verify-with-x509.html b/docs/api/xmlsec-verify-with-x509.html index 54e06cb0..13c55269 100644 --- a/docs/api/xmlsec-verify-with-x509.html +++ b/docs/api/xmlsec-verify-with-x509.html @@ -138,7 +138,7 @@ main(int argc, char **argv) { * xmlsec-crypto library. */ #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING - if(xmlSecCryptoDLLoadLibrary(BAD_CAST "default") < 0) { + if(xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n" "that you have it installed and check shared libraries path\n" "(LD_LIBRARY_PATH) envornment variable.\n"); diff --git a/docs/xmlsec-man.html b/docs/xmlsec-man.html index eb4d39a7..70caefce 100644 --- a/docs/xmlsec-man.html +++ b/docs/xmlsec-man.html @@ -289,7 +289,7 @@ <dd> </dd> </dl> <hr> -<p> This document was created by <a href="http://localhost/cgi-bin/man/man2html">man2html</a>, using the manual pages.<br> Time: 06:49:08 GMT, September 10, 2003 </p> +<p> This document was created by <a href="http://localhost/cgi-bin/man/man2html">man2html</a>, using the manual pages.<br> Time: 07:36:07 GMT, September 10, 2003 </p> </td></tr> <tr><td> <br><br><p><a href="bugs.html">Aleksey Sanin</a></p> diff --git a/xmlsec-config.in b/xmlsec-config.in index fe05a3d5..c59e5e50 100644 --- a/xmlsec-config.in +++ b/xmlsec-config.in @@ -118,7 +118,7 @@ the_xml_libs="`@LIBXML_CONFIG@ --libs`" # the_xslt_flags="" the_xslt_libs="" -if test "@LIBXSLT_WITHOUT@" = "no"; then +if test "@XMLSEC_NO_LIBXSLT@" = "0"; then the_xslt_flags="`@LIBXSLT_CONFIG@ --cflags`" the_xslt_libs="`@LIBXSLT_CONFIG@ --libs`" fi @@ -135,19 +135,19 @@ none) # than one crypto engine i sused by application) if [ "z@XMLSEC_NO_CRYPTO_DYNAMIC_LOADING@" != "z1" ] ; then - the_crypto_flags="-DXMLSEC_CRYPTO_DYNAMIC_LOADING=1 -DXMLSEC_CRYPTO=\"@XMLSEC_CRYPTO@\"" + the_crypto_flags="-DXMLSEC_CRYPTO_DYNAMIC_LOADING=1 -DXMLSEC_CRYPTO=\\\"@XMLSEC_CRYPTO@\\\"" fi ;; default) - the_crypto_flags="@XMLSEC_CRYPTO_CFLAGS@ -DXMLSEC_CRYPTO=\"@XMLSEC_CRYPTO@\"" + the_crypto_flags="@XMLSEC_CRYPTO_CFLAGS@ -DXMLSEC_CRYPTO=\\\"@XMLSEC_CRYPTO@\\\"" the_crypto_libs="@XMLSEC_CRYPTO_LIBS@" the_xmlsec_crypto_lib="-l@XMLSEC_CRYPTO_LIB@" ;; openssl) - if test "@OPENSSL_WITHOUT@" = "no"; then - the_crypto_flags="@OPENSSL_CFLAGS@" + if test "@XMLSEC_NO_OPENSSL@" = "0"; then + the_crypto_flags="@OPENSSL_CFLAGS@ -DXMLSEC_CRYPTO=\\\"openssl\\\"" the_crypto_libs="@OPENSSL_LIBS@" the_xmlsec_crypto_lib="-l@OPENSSL_CRYPTO_LIB@" else @@ -157,8 +157,8 @@ openssl) ;; gnutls) - if test "@GNUTLS_WITHOUT@" = "no"; then - the_crypto_flags="@GNUTLS_CFLAGS@" + if test "@XMLSEC_NO_GNUTLS@" = "0"; then + the_crypto_flags="@GNUTLS_CFLAGS@ -DXMLSEC_CRYPTO=\\\"gnutls\\\"" the_crypto_libs="@GNUTLS_LIBS@" the_xmlsec_crypto_lib="-l@GNUTLS_CRYPTO_LIB@" else @@ -168,8 +168,8 @@ gnutls) ;; nss) - if test "@NSS_WITHOUT@" = "no"; then - the_crypto_flags="@NSS_CFLAGS@" + if test "@XMLSEC_NO_NSS@" = "no"; then + the_crypto_flags="@NSS_CFLAGS@ -DXMLSEC_CRYPTO=\\\"nss\\\"" the_crypto_libs="@NSS_LIBS@" the_xmlsec_crypto_lib="-l@NSS_CRYPTO_LIB@" else @@ -188,8 +188,8 @@ esac # # Assemble all the settings together # -the_flags="$the_flags @XMLSEC_DEFINES@ -I${prefix}/include/xmlsec1 $the_xml_flags $the_xslt_flags $the_crypto_flags" -the_libs="$the_libs -L${exec_prefix}/lib $the_xmlsec_crypto_lib -lxmlsec1 $the_xml_libs $the_xslt_libs $the_crypto_libs" +the_flags="$the_flags @XMLSEC_CORE_CFLAGS@ $the_xml_flags $the_xslt_flags $the_crypto_flags" +the_libs="$the_libs -L${exec_prefix}/lib @XMLSEC_CORE_LIBS@ $the_xmlsec_crypto_lib -lxmlsec1 $the_xml_libs $the_xslt_libs $the_crypto_libs" if $cflags; then all_flags="$the_flags" diff --git a/xmlsec-gnutls.pc.in b/xmlsec-gnutls.pc.in index c65e4e61..e2c50a07 100644 --- a/xmlsec-gnutls.pc.in +++ b/xmlsec-gnutls.pc.in @@ -7,5 +7,5 @@ Name: xmlsec1-gnutls Version: @VERSION@ Description: XML Security Library implements XML Signature and XML Encryption standards Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ -Cflags: @XMLSEC_GNUTLS_CFLAGS@ +Cflags: -DXMLSEC_CRYPTO=\\\"gnutls\\\" @XMLSEC_GNUTLS_CFLAGS@ Libs: @XMLSEC_GNUTLS_LIBS@ diff --git a/xmlsec-nss.pc.in b/xmlsec-nss.pc.in index 60215f32..9a38435f 100644 --- a/xmlsec-nss.pc.in +++ b/xmlsec-nss.pc.in @@ -7,5 +7,5 @@ Name: xmlsec1-nss Version: @VERSION@ Description: XML Security Library implements XML Signature and XML Encryption standards Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ mozilla-nss >= @MOZILLA_MIN_VERSION@ -Cflags: -DXMLSEC_CRYPTO="nss" -DXMLSEC_CRYPTO_NSS=1 @XMLSEC_CORE_CFLAGS@ +Cflags: -DXMLSEC_CRYPTO=\\\"nss\\\" -DXMLSEC_CRYPTO_NSS=1 @XMLSEC_CORE_CFLAGS@ Libs: -L${libdir} -lxmlsec1-nss @XMLSEC_CORE_LIBS@ diff --git a/xmlsec-openssl.pc.in b/xmlsec-openssl.pc.in index b04022d7..31fe2611 100644 --- a/xmlsec-openssl.pc.in +++ b/xmlsec-openssl.pc.in @@ -7,5 +7,5 @@ Name: xmlsec1-openssl Version: @VERSION@ Description: XML Security Library implements XML Signature and XML Encryption standards Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ -Cflags: @XMLSEC_OPENSSL_CFLAGS@ +Cflags: -DXMLSEC_CRYPTO=\\\"openssl\\\" @XMLSEC_OPENSSL_CFLAGS@ Libs: @XMLSEC_OPENSSL_LIBS@ diff --git a/xmlsec.pc.in b/xmlsec.pc.in index 7b607b61..2207b27d 100644 --- a/xmlsec.pc.in +++ b/xmlsec.pc.in @@ -7,5 +7,5 @@ Name: xmlsec1 Version: @VERSION@ Description: XML Security Library implements XML Signature and XML Encryption standards Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ -Cflags: -DXMLSEC_CRYPTO="@XMLSEC_CRYPTO@" -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1 @XMLSEC_CORE_CFLAGS@ +Cflags: -DXMLSEC_CRYPTO=\\\"@XMLSEC_CRYPTO@\\\" -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1 @XMLSEC_CORE_CFLAGS@ Libs: -L${libdir} @XMLSEC_CORE_LIBS@ |