diff options
| author | minfrin <minfrin@13f79535-47bb-0310-9956-ffa450edef68> | 2009-01-04 12:23:18 +0000 |
|---|---|---|
| committer | minfrin <minfrin@13f79535-47bb-0310-9956-ffa450edef68> | 2009-01-04 12:23:18 +0000 |
| commit | e52103bf0dd2eab26cfa18d41571019287699afb (patch) | |
| tree | bf5c096ee47256cbabd1dbea65b01f8cddbab06f | |
| parent | 5a4f754c849cbcf92fb33b565c47c8beb1842486 (diff) | |
| download | libapr-util-e52103bf0dd2eab26cfa18d41571019287699afb.tar.gz | |
apr_crypto_nss: The nss.h header file could be in nss or nss3, the
prerror.h header file could be in nspr4.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@731236 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | build/crypto.m4 | 6 | ||||
| -rw-r--r-- | crypto/apr_crypto_nss.c | 17 |
3 files changed, 23 insertions, 3 deletions
@@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with APR-util 1.4.0 + *) apr_crypto_nss: The nss.h header file could be in nss or nss3, the + prerror.h header file could be in nspr4. [Graham Leggett] + *) apr_dbd_freetds: The sybdb.h header file might be freetds/sybdb.h or sybdb.h. [Graham Leggett] diff --git a/build/crypto.m4 b/build/crypto.m4 index 711d079c..7a418669 100644 --- a/build/crypto.m4 +++ b/build/crypto.m4 @@ -142,7 +142,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_NSS], [ [APR_HELP_STRING([--with-nss=DIR], [specify location of OpenSSL])], [ if test "$withval" = "yes"; then - AC_CHECK_HEADERS(nspr/nspr.h nss/nss.h, [nss_have_headers=1]) + AC_CHECK_HEADERS(prerror.h nspr4/prerror.h nss/nss.h nss3/nss.h nss/pk11pub.h nss3/pk11pub.h, [nss_have_headers=1]) AC_CHECK_LIB(nspr4, PR_Initialize, AC_CHECK_LIB(nss3, PK11_CreatePBEV2AlgorithmID, [nss_have_libs=1],,-lnspr4)) if test "$nss_have_headers" != "0" && test "$nss_have_libs" != "0"; then apu_have_nss=1 @@ -160,7 +160,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_NSS], [ APR_ADDTO(LDFLAGS, [$nss_LDFLAGS]) AC_MSG_NOTICE(checking for nss in $withval) - AC_CHECK_HEADERS(nspr/nspr.h nss/nss.h, [nss_have_headers=1]) + AC_CHECK_HEADERS(prerror.h nspr4/prerror.h nss/nss.h nss3/nss.h nss/pk11pub.h nss3/pk11pub.h, [nss_have_headers=1]) AC_CHECK_LIB(nspr4, PR_Initialize, AC_CHECK_LIB(nss3, PK11_CreatePBEV2AlgorithmID, [nss_have_libs=1],,-lnspr4)) if test "$nss_have_headers" != "0" && test "$nss_have_libs" != "0"; then apu_have_nss=1 @@ -169,7 +169,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_NSS], [ fi if test "$apu_have_nss" != "1"; then - AC_CHECK_HEADERS(nspr/nspr.h nss/nss.h, [nss_have_headers=1]) + AC_CHECK_HEADERS(prerror.h nspr4/prerror.h nss/nss.h nss3/nss.h nss/pk11pub.h nss3/pk11pub.h, [nss_have_headers=1]) AC_CHECK_LIB(nspr4, PR_Initialize, AC_CHECK_LIB(nss3, PK11_CreatePBEV2AlgorithmID, [nss_have_libs=1],,-lnspr4)) if test "$nss_have_headers" != "0" && test "$nss_have_libs" != "0"; then apu_have_nss=1 diff --git a/crypto/apr_crypto_nss.c b/crypto/apr_crypto_nss.c index 17dcb6de..29a79bbb 100644 --- a/crypto/apr_crypto_nss.c +++ b/crypto/apr_crypto_nss.c @@ -30,9 +30,26 @@ #if APU_HAVE_CRYPTO +#ifdef HAVE_PRERROR_H #include <prerror.h> +#endif +#ifdef HAVE_NSPR4_PRERROR_H +#include <nspr4/prerror.h> +#endif + +#ifdef HAVE_NSS_NSS_H #include <nss/nss.h> +#endif +#ifdef HAVE_NSS3_NSS_H +#include <nss3/nss.h> +#endif + +#ifdef HAVE_NSS_PK11PUB_H #include <nss/pk11pub.h> +#endif +#ifdef HAVE_NSS3_PK11PUB_H +#include <nss3/pk11pub.h> +#endif struct apr_crypto_config_t { }; |