Bump for 4.0-15
[LibreOffice.git] / libxmlsec / xmlsec1-1.2.14_old_automake.patch
bloba80265903b07831e97d862fada45e306e45bb8ba
1 --- misc/xmlsec1-1.2.14/configure.in 2012-09-12 19:15:56.000000000 +0200
2 +++ misc/build/xmlsec1-1.2.14/configure.in 2012-09-12 18:56:01.000000000 +0200
3 @@ -21,8 +21,8 @@
4 AC_SUBST(XMLSEC_VERSION_INFO)
6 AC_CONFIG_MACRO_DIR(m4)
7 -AM_INIT_AUTOMAKE([1.7 tar-ustar])
8 -AC_CONFIG_HEADERS([config.h])
9 +AM_INIT_AUTOMAKE([1.6.3])
10 +AM_CONFIG_HEADER([config.h])
11 AM_MAINTAINER_MODE
13 dnl
14 --- misc/xmlsec1-1.2.14/src/gnutls/Makefile.am 2009-12-05 22:19:18.000000000 +0100
15 +++ misc/build/xmlsec1-1.2.14/src/gnutls/Makefile.am 2012-09-12 19:09:38.000000000 +0200
16 @@ -18,7 +18,11 @@
17 $(LIBXML_CFLAGS) \
18 $(NULL)
20 -libxmlsec1_gnutls_la_SOURCES =\
21 +if SHAREDLIB_HACK
22 +SHAREDLIBHACKDEP = ../strings.c
23 +endif
25 +libxmlsec1_gnutls_la_SOURCES = $(SHAREDLIBHACKDEP) \
26 app.c \
27 ciphers.c \
28 crypto.c \
29 @@ -28,10 +32,6 @@
30 globals.h \
31 $(NULL)
33 -if SHAREDLIB_HACK
34 -libxmlsec1_gnutls_la_SOURCES += ../strings.c
35 -endif
37 libxmlsec1_gnutls_la_LIBADD = \
38 ../libxmlsec1.la \
39 $(GNUTLS_LIBS) \
40 --- misc/xmlsec1-1.2.14/src/mscrypto/Makefile.am 2012-09-12 19:15:56.000000000 +0200
41 +++ misc/build/xmlsec1-1.2.14/src/mscrypto/Makefile.am 2012-09-12 19:10:52.000000000 +0200
42 @@ -19,7 +19,11 @@
43 $(LIBXML_CFLAGS) \
44 $(NULL)
46 -libxmlsec1_mscrypto_la_SOURCES =\
47 +if SHAREDLIB_HACK
48 +SHAREDLIBHACKDEP = ../strings.c
49 +endif
51 +libxmlsec1_mscrypto_la_SOURCES = $(SHAREDLIBHACKDEP) \
52 app.c \
53 certkeys.c \
54 ciphers.c \
55 @@ -38,10 +42,6 @@
56 akmngr.c \
57 $(NULL)
59 -if SHAREDLIB_HACK
60 -libxmlsec1_mscrypto_la_SOURCES += ../strings.c
61 -endif
63 libxmlsec1_mscrypto_la_LIBADD = \
64 ../libxmlsec1.la \
65 $(MSCRYPTO_LIBS) \
66 --- misc/xmlsec1-1.2.14/src/nss/Makefile.am 2012-09-12 19:15:56.000000000 +0200
67 +++ misc/build/xmlsec1-1.2.14/src/nss/Makefile.am 2012-09-12 19:11:58.000000000 +0200
68 @@ -8,7 +8,7 @@
69 libxmlsec1-nss.la \
70 $(NULL)
72 -libxmlsec1_nss_la_CPPFLAGS = \
73 +libxmlsec1_nss_la_CFLAGS = \
74 -DPACKAGE=\"@PACKAGE@\" \
75 -I../../include \
76 -I$(top_srcdir)/include \
77 @@ -18,7 +18,11 @@
78 $(LIBXML_CFLAGS) \
79 $(NULL)
81 -libxmlsec1_nss_la_SOURCES =\
82 +if SHAREDLIB_HACK
83 +SHAREDLIBHACKDEP = ../strings.c
84 +endif
86 +libxmlsec1_nss_la_SOURCES = $(SHAREDLIBHACKDEP) \
87 app.c \
88 bignum.c \
89 ciphers.c \
90 @@ -40,10 +44,6 @@
91 tokens.c \
92 $(NULL)
94 -if SHAREDLIB_HACK
95 -libxmlsec1_nss_la_SOURCES += ../strings.c
96 -endif
98 libxmlsec1_nss_la_LIBADD = \
99 ../libxmlsec1.la \
100 $(NSS_LIBS) \
101 --- misc/xmlsec1-1.2.14/src/openssl/Makefile.am 2009-12-05 22:19:18.000000000 +0100
102 +++ misc/build/xmlsec1-1.2.14/src/openssl/Makefile.am 2012-09-12 19:12:55.000000000 +0200
103 @@ -18,7 +18,11 @@
104 $(LIBXML_CFLAGS) \
105 $(NULL)
107 -libxmlsec1_openssl_la_SOURCES =\
108 +if SHAREDLIB_HACK
109 +SHAREDLIBHACKDEP = ../strings.c
110 +endif
112 +libxmlsec1_openssl_la_SOURCES = $(SHAREDLIBHACKDEP) \
113 app.c \
114 bn.c \
115 ciphers.c \
116 @@ -36,10 +40,6 @@
117 globals.h \
118 $(NULL)
120 -if SHAREDLIB_HACK
121 -libxmlsec1_openssl_la_SOURCES += ../strings.c
122 -endif
124 libxmlsec1_openssl_la_LIBADD = \
125 ../libxmlsec1.la \
126 $(OPENSSL_LIBS) \