diff options
| author | Daniel Neus <[email protected]> | 2016-08-12 16:12:52 +0200 |
|---|---|---|
| committer | Daniel Neus <[email protected]> | 2016-08-12 16:12:52 +0200 |
| commit | a56f569a2024a4e13db165308947c8a6aa87859c (patch) | |
| tree | 9bcf1dc1beadb0fa5620491e41a00db02f120e3a /src/lib | |
| parent | 25710f5375edb1af47699d128c04b4de0f2d0547 (diff) | |
Headers can be marked as external by using `<header:external>` in info.txt.
These headers are copied/linked into build_dir/include/external
This has the advantage that external includes can be taken as they are, they haven't to be modified.
Fixes amalgamation build with enabled pkcs#11 module
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/prov/pkcs11/info.txt | 5 | ||||
| -rw-r--r-- | src/lib/prov/pkcs11/p11.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/prov/pkcs11/info.txt b/src/lib/prov/pkcs11/info.txt index 37a7f0d4d..2715c7cda 100644 --- a/src/lib/prov/pkcs11/info.txt +++ b/src/lib/prov/pkcs11/info.txt @@ -10,10 +10,13 @@ pk_pad <header:internal> p11_mechanism.h +</header:internal> + +<header:external> pkcs11.h pkcs11f.h pkcs11t.h -</header:internal> +</header:external> <header:public> p11.h diff --git a/src/lib/prov/pkcs11/p11.h b/src/lib/prov/pkcs11/p11.h index df077f62b..c18c07d59 100644 --- a/src/lib/prov/pkcs11/p11.h +++ b/src/lib/prov/pkcs11/p11.h @@ -50,7 +50,7 @@ #pragma pack(push, cryptoki, 1) #endif -#include <botan/internal/pkcs11.h> +#include "pkcs11.h" #if defined(_MSC_VER) #pragma pack(pop, cryptoki) |