nettle: import from packages, update to 3.0
[openwrt.git] / package / libs / nettle / patches / 0004-Added-auto-generated-nettle-config.h.patch
1 From 7508bb15de94b38402152757f75ff3e2094fdd86 Mon Sep 17 00:00:00 2001
2 From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
3 Date: Sun, 9 Mar 2014 13:27:03 +0100
4 Subject: [PATCH 4/5] Added-auto-generated-nettle-config.h
5
6 ---
7  Makefile.in              | 4 ++--
8  bignum.h                 | 1 +
9  configure.ac             | 1 +
10  examples/ecc-benchmark.c | 1 +
11  nettle-config.h.in       | 6 ++++++
12  testsuite/testutils.h    | 1 +
13  7 files changed, 13 insertions(+), 2 deletions(-)
14  create mode 100644 nettle-config.h.in
15
16 --- a/Makefile.in
17 +++ b/Makefile.in
18 @@ -178,7 +178,7 @@ HEADERS = aes.h arcfour.h arctwo.h asn1.
19           ecc-curve.h ecc.h ecdsa.h \
20           gcm.h gosthash94.h hmac.h \
21           knuth-lfib.h \
22 -         macros.h \
23 +         macros.h nettle-config.h \
24           md2.h md4.h \
25           md5.h md5-compat.h \
26           memxor.h \
27 @@ -203,7 +203,7 @@ DISTFILES = $(SOURCES) $(HEADERS) getopt
28         config.h.in config.m4.in config.make.in Makefile.in \
29         README AUTHORS COPYING.LESSERv3 COPYINGv2 COPYINGv3 \
30         INSTALL NEWS TODO ChangeLog \
31 -       nettle.pc.in hogweed.pc.in \
32 +       nettle.pc.in hogweed.pc.in nettle-config.h.in \
33         $(des_headers) descore.README \
34         aes-internal.h camellia-internal.h serpent-internal.h \
35         cast128_sboxes.h desinfo.h desCode.h \
36 --- a/bignum.h
37 +++ b/bignum.h
38 @@ -34,6 +34,7 @@
39  #ifndef NETTLE_BIGNUM_H_INCLUDED
40  #define NETTLE_BIGNUM_H_INCLUDED
41  
42 +#include "nettle-config.h"
43  #include "nettle-meta.h"
44  
45  #ifdef USE_MINI_GMP
46 --- a/configure.ac
47 +++ b/configure.ac
48 @@ -10,6 +10,7 @@ AC_CONFIG_AUX_DIR([.])
49  AC_CONFIG_MACRO_DIR([.])
50  
51  AC_CONFIG_HEADER([config.h])
52 +AC_CONFIG_HEADER([nettle-config.h])
53  
54  LIBNETTLE_MAJOR=5
55  LIBNETTLE_MINOR=0
56 --- a/examples/ecc-benchmark.c
57 +++ b/examples/ecc-benchmark.c
58 @@ -47,6 +47,7 @@
59  #include "timing.h"
60  
61  #undef USE_MINI_GMP
62 +#define NETTLE_CONFIG_H_INCLUDED
63  #include <gmp.h>
64  #include "../ecc.h"
65  #include "../ecc-internal.h"
66 --- /dev/null
67 +++ b/nettle-config.h.in
68 @@ -0,0 +1,6 @@
69 +#ifndef NETTLE_CONFIG_H_INCLUDED
70 +#define NETTLE_CONFIG_H_INCLUDED
71 +
72 +#undef USE_MINI_GMP
73 +
74 +#endif
75 --- a/testsuite/testutils.h
76 +++ b/testsuite/testutils.h
77 @@ -15,6 +15,7 @@
78  
79  #if WITH_HOGWEED
80  # include <gmp.h>
81 +# define NETTLE_CONFIG_H_INCLUDED
82  # undef USE_MINI_GMP
83  # include "rsa.h"
84  # include "dsa-compat.h"