You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mi...@apache.org on 2009/01/04 13:23:18 UTC
svn commit: r731236 - in /apr/apr-util/trunk: CHANGES build/crypto.m4
crypto/apr_crypto_nss.c
Author: minfrin
Date: Sun Jan 4 04:23:18 2009
New Revision: 731236
URL: http://svn.apache.org/viewvc?rev=731236&view=rev
Log:
apr_crypto_nss: The nss.h header file could be in nss or nss3, the
prerror.h header file could be in nspr4.
Modified:
apr/apr-util/trunk/CHANGES
apr/apr-util/trunk/build/crypto.m4
apr/apr-util/trunk/crypto/apr_crypto_nss.c
Modified: apr/apr-util/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/CHANGES?rev=731236&r1=731235&r2=731236&view=diff
==============================================================================
--- apr/apr-util/trunk/CHANGES [utf-8] (original)
+++ apr/apr-util/trunk/CHANGES [utf-8] Sun Jan 4 04:23:18 2009
@@ -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]
Modified: apr/apr-util/trunk/build/crypto.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/crypto.m4?rev=731236&r1=731235&r2=731236&view=diff
==============================================================================
--- apr/apr-util/trunk/build/crypto.m4 (original)
+++ apr/apr-util/trunk/build/crypto.m4 Sun Jan 4 04:23:18 2009
@@ -142,7 +142,7 @@
[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 @@
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 @@
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
Modified: apr/apr-util/trunk/crypto/apr_crypto_nss.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/crypto/apr_crypto_nss.c?rev=731236&r1=731235&r2=731236&view=diff
==============================================================================
--- apr/apr-util/trunk/crypto/apr_crypto_nss.c (original)
+++ apr/apr-util/trunk/crypto/apr_crypto_nss.c Sun Jan 4 04:23:18 2009
@@ -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 {
};