| author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
| Fri, 14 Oct 2016 14:53:30 -0700 | |
| changeset 7114 | 72d09e38c454 |
| parent 6997 | a189d9fb566c |
| permissions | -rw-r--r-- |
|
6997
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
1 |
Upstream fixes already included in the latest community updates to coolkey v1.1.0 |
|
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
2 |
|
|
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
3 |
Fixes a syntax error when running configure script. |
|
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
4 |
|
|
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
5 |
--- a/configure.in (revision 53) |
|
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
6 |
+++ b/configure.in (revision 81) |
|
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
7 |
@@ -124,9 +124,9 @@ |
|
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
8 |
if test $WINDOWS -ne 1; then |
|
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
9 |
PKG_CHECK_MODULES(NSS, nss, true, [ AC_MSG_ERROR(could not find NSS Crypto libraries) ]) |
|
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
10 |
fi |
|
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
11 |
- enable_pk11install = "yes" |
|
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
12 |
+ enable_pk11install="yes" |
|
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
13 |
else |
|
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
14 |
- enable_pk11install = "no" |
|
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
15 |
+ enable_pk11install="no" |
|
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
16 |
AC_MSG_WARN([skipping pk11install]) |
|
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
17 |
fi |
|
a189d9fb566c
PSARC/2016/219 Coolkey PKCS#11 provider for smartcard devices
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
18 |