Annotation of /trunk/libotr/patches/libotr3-3.2.1-soname-2.patch
Parent Directory | Revision Log
Revision 2001 -
(hide annotations)
(download)
Fri Dec 21 13:22:48 2012 UTC (11 years, 9 months ago) by niro
File size: 20280 byte(s)
Fri Dec 21 13:22:48 2012 UTC (11 years, 9 months ago) by niro
File size: 20280 byte(s)
-fixed broken commit
1 | niro | 1999 | diff -Naur libotr-3.2.1/Makefile.am libotr-3.2.1-magellan/Makefile.am |
2 | niro | 2001 | --- libotr-3.2.1/Makefile.am 2012-08-14 14:15:56.000000000 +0200 |
3 | niro | 1999 | +++ libotr-3.2.1-magellan/Makefile.am 2012-12-21 16:19:03.804279602 +0100 |
4 | niro | 2001 | @@ -1,9 +1,9 @@ |
5 | SUBDIRS = src toolkit | ||
6 | |||
7 | -EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr.m4 libotr.pc.in | ||
8 | niro | 1999 | +EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr3.m4 libotr3.pc.in |
9 | niro | 2001 | |
10 | aclocaldir = $(datadir)/aclocal | ||
11 | -aclocal_DATA = libotr.m4 | ||
12 | niro | 1999 | +aclocal_DATA = libotr3.m4 |
13 | niro | 2001 | |
14 | pkgconfigdir = $(libdir)/pkgconfig | ||
15 | -pkgconfig_DATA = libotr.pc | ||
16 | niro | 1999 | +pkgconfig_DATA = libotr3.pc |
17 | diff -Naur libotr-3.2.1/Makefile.in libotr-3.2.1-magellan/Makefile.in | ||
18 | niro | 2001 | --- libotr-3.2.1/Makefile.in 2012-08-14 15:02:04.000000000 +0200 |
19 | niro | 1999 | +++ libotr-3.2.1-magellan/Makefile.in 2012-12-21 16:19:29.701287006 +0100 |
20 | niro | 2001 | @@ -37,7 +37,7 @@ |
21 | subdir = . | ||
22 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ | ||
23 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ | ||
24 | - $(srcdir)/libotr.pc.in $(top_srcdir)/configure AUTHORS COPYING \ | ||
25 | niro | 1999 | + $(srcdir)/libotr3.pc.in $(top_srcdir)/configure AUTHORS COPYING \ |
26 | niro | 2001 | COPYING.LIB ChangeLog INSTALL NEWS config.guess config.sub \ |
27 | depcomp install-sh ltmain.sh missing | ||
28 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
29 | @@ -48,7 +48,7 @@ | ||
30 | configure.lineno config.status.lineno | ||
31 | mkinstalldirs = $(install_sh) -d | ||
32 | CONFIG_HEADER = config.h | ||
33 | -CONFIG_CLEAN_FILES = libotr.pc | ||
34 | niro | 1999 | +CONFIG_CLEAN_FILES = libotr3.pc |
35 | niro | 2001 | CONFIG_CLEAN_VPATH_FILES = |
36 | SOURCES = | ||
37 | DIST_SOURCES = | ||
38 | @@ -162,7 +162,7 @@ | ||
39 | LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ | ||
40 | LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ | ||
41 | LIBOBJS = @LIBOBJS@ | ||
42 | -LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@ | ||
43 | niro | 1999 | +LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@ |
44 | niro | 2001 | LIBS = @LIBS@ |
45 | LIBTOOL = @LIBTOOL@ | ||
46 | LIPO = @LIPO@ | ||
47 | @@ -243,11 +243,11 @@ | ||
48 | top_builddir = @top_builddir@ | ||
49 | top_srcdir = @top_srcdir@ | ||
50 | SUBDIRS = src toolkit | ||
51 | -EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr.m4 libotr.pc.in | ||
52 | niro | 1999 | +EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr3.m4 libotr3.pc.in |
53 | niro | 2001 | aclocaldir = $(datadir)/aclocal |
54 | -aclocal_DATA = libotr.m4 | ||
55 | niro | 1999 | +aclocal_DATA = libotr3.m4 |
56 | niro | 2001 | pkgconfigdir = $(libdir)/pkgconfig |
57 | -pkgconfig_DATA = libotr.pc | ||
58 | niro | 1999 | +pkgconfig_DATA = libotr3.pc |
59 | niro | 2001 | all: config.h |
60 | $(MAKE) $(AM_MAKEFLAGS) all-recursive | ||
61 | |||
62 | @@ -303,7 +303,7 @@ | ||
63 | |||
64 | distclean-hdr: | ||
65 | -rm -f config.h stamp-h1 | ||
66 | -libotr.pc: $(top_builddir)/config.status $(srcdir)/libotr.pc.in | ||
67 | niro | 1999 | +libotr3.pc: $(top_builddir)/config.status $(srcdir)/libotr3.pc.in |
68 | niro | 2001 | cd $(top_builddir) && $(SHELL) ./config.status $@ |
69 | |||
70 | mostlyclean-libtool: | ||
71 | niro | 1999 | diff -Naur libotr-3.2.1/configure.ac libotr-3.2.1-magellan/configure.ac |
72 | niro | 2001 | --- libotr-3.2.1/configure.ac 2012-08-14 15:01:57.000000000 +0200 |
73 | niro | 1999 | +++ libotr-3.2.1-magellan/configure.ac 2012-12-21 16:00:28.734986985 +0100 |
74 | niro | 2001 | @@ -6,20 +6,20 @@ |
75 | |||
76 | dnl Notes on version numbering: | ||
77 | dnl For an implementation-only change: | ||
78 | -dnl Change the libotr package version from a.b.c to a.b.(c+1) | ||
79 | -dnl Change the libotr libtool version from x:y:z to x:(y+1):z | ||
80 | niro | 1999 | +dnl Change the libotr3 package version from a.b.c to a.b.(c+1) |
81 | +dnl Change the libotr3 libtool version from x:y:z to x:(y+1):z | ||
82 | niro | 2001 | dnl For a backwards-compatible API change (e.g. adding functions): |
83 | -dnl Change the libotr package version from a.b.c to a.(b+1).0 | ||
84 | -dnl Change the libotr libtool version from x:y:z to (x+1):0:(z+1) | ||
85 | niro | 1999 | +dnl Change the libotr3 package version from a.b.c to a.(b+1).0 |
86 | +dnl Change the libotr3 libtool version from x:y:z to (x+1):0:(z+1) | ||
87 | niro | 2001 | dnl [Note that this does *not* change the major number of the .so.] |
88 | dnl For a backwards-incompatible API change (e.g. changing data structures): | ||
89 | -dnl Change the libotr package version from a.b.c to (a+1).0.0 | ||
90 | -dnl Change the libotr libtool version from x:y:z to (x+1):0:0 | ||
91 | niro | 1999 | +dnl Change the libotr3 package version from a.b.c to (a+1).0.0 |
92 | +dnl Change the libotr3 libtool version from x:y:z to (x+1):0:0 | ||
93 | niro | 2001 | |
94 | -AM_INIT_AUTOMAKE(libotr, 3.2.1) | ||
95 | -LIBOTR_LIBTOOL_VERSION="4:1:2" | ||
96 | niro | 1999 | +AM_INIT_AUTOMAKE(libotr3, 3.2.1) |
97 | +LIBOTR3_LIBTOOL_VERSION="4:1:2" | ||
98 | niro | 2001 | |
99 | -AC_SUBST(LIBOTR_LIBTOOL_VERSION) | ||
100 | niro | 1999 | +AC_SUBST(LIBOTR3_LIBTOOL_VERSION) |
101 | niro | 2001 | |
102 | AC_PROG_CC | ||
103 | |||
104 | @@ -27,5 +27,5 @@ | ||
105 | |||
106 | AM_PATH_LIBGCRYPT(1:1.2.0,,AC_MSG_ERROR(libgcrypt 1.2.0 or newer is required.)) | ||
107 | |||
108 | -AC_OUTPUT([Makefile src/Makefile toolkit/Makefile libotr.pc]) | ||
109 | niro | 1999 | +AC_OUTPUT([Makefile src/Makefile toolkit/Makefile libotr3.pc]) |
110 | niro | 2001 | |
111 | diff -Naur libotr-3.2.1/libotr.m4 libotr-3.2.1-magellan/libotr.m4 | ||
112 | --- libotr-3.2.1/libotr.m4 2012-08-14 14:15:56.000000000 +0200 | ||
113 | +++ libotr-3.2.1-magellan/libotr.m4 1970-01-01 01:00:00.000000000 +0100 | ||
114 | @@ -1,134 +0,0 @@ | ||
115 | -dnl | ||
116 | -dnl Off-the-Record Messaging library | ||
117 | -dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov | ||
118 | -dnl <otr@cypherpunks.ca> | ||
119 | -dnl | ||
120 | -dnl This library is free software; you can redistribute it and/or | ||
121 | -dnl modify it under the terms of version 2.1 of the GNU Lesser General | ||
122 | -dnl Public License as published by the Free Software Foundation. | ||
123 | -dnl | ||
124 | -dnl This library is distributed in the hope that it will be useful, | ||
125 | -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
126 | -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
127 | -dnl Lesser General Public License for more details. | ||
128 | -dnl | ||
129 | -dnl You should have received a copy of the GNU Lesser General Public | ||
130 | -dnl License along with this library; if not, write to the Free Software | ||
131 | -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
132 | -dnl | ||
133 | - | ||
134 | -dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) | ||
135 | -dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate. | ||
136 | -dnl enables arguments --with-libotr-prefix= | ||
137 | -dnl --with-libotr-inc-prefix= | ||
138 | -dnl | ||
139 | -dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT | ||
140 | -dnl | ||
141 | -dnl Adapted from alsa.m4, originally by | ||
142 | -dnl Richard Boulton <richard-alsa@tartarus.org> | ||
143 | -dnl Christopher Lansdown <lansdoct@cs.alfred.edu> | ||
144 | -dnl Jaroslav Kysela <perex@suse.cz> | ||
145 | - | ||
146 | -AC_DEFUN([AM_PATH_LIBOTR], | ||
147 | -[dnl Save the original CFLAGS, LDFLAGS, and LIBS | ||
148 | -libotr_save_CFLAGS="$CFLAGS" | ||
149 | -libotr_save_LDFLAGS="$LDFLAGS" | ||
150 | -libotr_save_LIBS="$LIBS" | ||
151 | -libotr_found=yes | ||
152 | - | ||
153 | -dnl | ||
154 | -dnl Get the cflags and libraries for libotr | ||
155 | -dnl | ||
156 | -AC_ARG_WITH(libotr-prefix, | ||
157 | -[ --with-libotr-prefix=PFX Prefix where libotr is installed(optional)], | ||
158 | -[libotr_prefix="$withval"], [libotr_prefix=""]) | ||
159 | - | ||
160 | -AC_ARG_WITH(libotr-inc-prefix, | ||
161 | -[ --with-libotr-inc-prefix=PFX Prefix where libotr includes are (optional)], | ||
162 | -[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""]) | ||
163 | - | ||
164 | -dnl Add any special include directories | ||
165 | -AC_MSG_CHECKING(for libotr CFLAGS) | ||
166 | -if test "$libotr_inc_prefix" != "" ; then | ||
167 | - LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix" | ||
168 | - CFLAGS="$CFLAGS $LIBOTR_CFLAGS" | ||
169 | -fi | ||
170 | -AC_MSG_RESULT($LIBOTR_CFLAGS) | ||
171 | - | ||
172 | -dnl add any special lib dirs | ||
173 | -AC_MSG_CHECKING(for libotr LIBS) | ||
174 | -if test "$libotr_prefix" != "" ; then | ||
175 | - LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix" | ||
176 | - LDFLAGS="$LDFLAGS $LIBOTR_LIBS" | ||
177 | -fi | ||
178 | - | ||
179 | -dnl add the libotr library | ||
180 | -LIBOTR_LIBS="$LIBOTR_LIBS -lotr" | ||
181 | -LIBS="$LIBOTR_LIBS $LIBS" | ||
182 | -AC_MSG_RESULT($LIBOTR_LIBS) | ||
183 | - | ||
184 | -dnl Check for a working version of libotr that is of the right version. | ||
185 | -min_libotr_version=ifelse([$1], ,3.0.0,$1) | ||
186 | -no_libotr="" | ||
187 | - libotr_min_major_version=`echo $min_libotr_version | \ | ||
188 | - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | ||
189 | - libotr_min_minor_version=`echo $min_libotr_version | \ | ||
190 | - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | ||
191 | - libotr_min_sub_version=`echo $min_libotr_version | \ | ||
192 | - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | ||
193 | -AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version) | ||
194 | - | ||
195 | -AC_LANG_SAVE | ||
196 | -AC_LANG_C | ||
197 | -AC_TRY_COMPILE([ | ||
198 | -#include <stdlib.h> | ||
199 | -#include <libotr/version.h> | ||
200 | -], [ | ||
201 | -# if(OTRL_VERSION_MAJOR != $libotr_min_major_version) | ||
202 | -# error not present | ||
203 | -# else | ||
204 | - | ||
205 | -# if(OTRL_VERSION_MINOR > $libotr_min_minor_version) | ||
206 | - exit(0); | ||
207 | -# else | ||
208 | -# if(OTRL_VERSION_MINOR < $libotr_min_minor_version) | ||
209 | -# error not present | ||
210 | -# endif | ||
211 | - | ||
212 | -# if(OTRL_VERSION_SUB < $libotr_min_sub_version) | ||
213 | -# error not present | ||
214 | -# endif | ||
215 | -# endif | ||
216 | -# endif | ||
217 | -exit(0); | ||
218 | -], | ||
219 | - [AC_MSG_RESULT(found.)], | ||
220 | - [AC_MSG_RESULT(not present.) | ||
221 | - ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)]) | ||
222 | - libotr_found=no] | ||
223 | -) | ||
224 | -AC_LANG_RESTORE | ||
225 | - | ||
226 | -dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. | ||
227 | -AC_CHECK_LIB([otr], [otrl_message_receiving],, | ||
228 | - [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)]) | ||
229 | - libotr_found=no], | ||
230 | - $LIBGCRYPT_LIBS | ||
231 | -) | ||
232 | - | ||
233 | -LDFLAGS="$libotr_save_LDFLAGS" | ||
234 | -LIBS="$libotr_save_LIBS" | ||
235 | - | ||
236 | -if test "x$libotr_found" = "xyes" ; then | ||
237 | - ifelse([$2], , :, [$2]) | ||
238 | -else | ||
239 | - LIBOTR_CFLAGS="" | ||
240 | - LIBOTR_LIBS="" | ||
241 | - ifelse([$3], , :, [$3]) | ||
242 | -fi | ||
243 | - | ||
244 | -dnl That should be it. Now just export our symbols: | ||
245 | -AC_SUBST(LIBOTR_CFLAGS) | ||
246 | -AC_SUBST(LIBOTR_LIBS) | ||
247 | -]) | ||
248 | - | ||
249 | diff -Naur libotr-3.2.1/libotr.pc.in libotr-3.2.1-magellan/libotr.pc.in | ||
250 | --- libotr-3.2.1/libotr.pc.in 2012-08-14 14:15:56.000000000 +0200 | ||
251 | +++ libotr-3.2.1-magellan/libotr.pc.in 1970-01-01 01:00:00.000000000 +0100 | ||
252 | @@ -1,11 +0,0 @@ | ||
253 | -prefix=@prefix@ | ||
254 | -exec_prefix=@exec_prefix@ | ||
255 | -libdir=@libdir@ | ||
256 | -includedir=@includedir@ | ||
257 | - | ||
258 | -Name: libotr | ||
259 | -Description: Off-the-Record Messaging Library | ||
260 | -Version: 3.1.0 | ||
261 | -URL: http://otr.cypherpunks.ca/ | ||
262 | -Libs: -L${libdir} -lotr | ||
263 | -Cflags: -I${includedir} | ||
264 | niro | 2000 | diff -Naur libotr-3.2.1/libotr3.m4 libotr-3.2.1-magellan/libotr3.m4 |
265 | --- libotr-3.2.1/libotr3.m4 1970-01-01 01:00:00.000000000 +0100 | ||
266 | +++ libotr-3.2.1-magellan/libotr3.m4 2012-12-21 16:17:42.821253768 +0100 | ||
267 | @@ -0,0 +1,134 @@ | ||
268 | +dnl | ||
269 | +dnl Off-the-Record Messaging library | ||
270 | +dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov | ||
271 | +dnl <otr@cypherpunks.ca> | ||
272 | +dnl | ||
273 | +dnl This library is free software; you can redistribute it and/or | ||
274 | +dnl modify it under the terms of version 2.1 of the GNU Lesser General | ||
275 | +dnl Public License as published by the Free Software Foundation. | ||
276 | +dnl | ||
277 | +dnl This library is distributed in the hope that it will be useful, | ||
278 | +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
279 | +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
280 | +dnl Lesser General Public License for more details. | ||
281 | +dnl | ||
282 | +dnl You should have received a copy of the GNU Lesser General Public | ||
283 | +dnl License along with this library; if not, write to the Free Software | ||
284 | +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
285 | +dnl | ||
286 | + | ||
287 | niro | 1999 | +dnl AM_PATH_LIBOTR3([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) |
288 | +dnl Test for libotr3, and define LIBOTR3_CFLAGS and LIBOTR3_LIBS as appropriate. | ||
289 | +dnl enables arguments --with-libotr3-prefix= | ||
290 | +dnl --with-libotr3-inc-prefix= | ||
291 | niro | 2000 | +dnl |
292 | +dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT | ||
293 | +dnl | ||
294 | +dnl Adapted from alsa.m4, originally by | ||
295 | +dnl Richard Boulton <richard-alsa@tartarus.org> | ||
296 | +dnl Christopher Lansdown <lansdoct@cs.alfred.edu> | ||
297 | +dnl Jaroslav Kysela <perex@suse.cz> | ||
298 | + | ||
299 | niro | 1999 | +AC_DEFUN([AM_PATH_LIBOTR3], |
300 | niro | 2000 | +[dnl Save the original CFLAGS, LDFLAGS, and LIBS |
301 | niro | 1999 | +libotr3_save_CFLAGS="$CFLAGS" |
302 | +libotr3_save_LDFLAGS="$LDFLAGS" | ||
303 | +libotr3_save_LIBS="$LIBS" | ||
304 | +libotr3_found=yes | ||
305 | niro | 2000 | + |
306 | +dnl | ||
307 | niro | 1999 | +dnl Get the cflags and libraries for libotr3 |
308 | niro | 2000 | +dnl |
309 | niro | 1999 | +AC_ARG_WITH(libotr3-prefix, |
310 | +[ --with-libotr3-prefix=PFX Prefix where libotr3 is installed(optional)], | ||
311 | +[libotr3_prefix="$withval"], [libotr3_prefix=""]) | ||
312 | + | ||
313 | +AC_ARG_WITH(libotr3-inc-prefix, | ||
314 | +[ --with-libotr3-inc-prefix=PFX Prefix where libotr3 includes are (optional)], | ||
315 | +[libotr3_inc_prefix="$withval"], [libotr3_inc_prefix=""]) | ||
316 | niro | 2000 | + |
317 | +dnl Add any special include directories | ||
318 | niro | 1999 | +AC_MSG_CHECKING(for libotr3 CFLAGS) |
319 | +if test "$libotr3_inc_prefix" != "" ; then | ||
320 | + LIBOTR3_CFLAGS="$LIBOTR3_CFLAGS -I$libotr3_inc_prefix" | ||
321 | + CFLAGS="$CFLAGS $LIBOTR3_CFLAGS" | ||
322 | niro | 2000 | +fi |
323 | niro | 1999 | +AC_MSG_RESULT($LIBOTR3_CFLAGS) |
324 | niro | 2000 | + |
325 | +dnl add any special lib dirs | ||
326 | niro | 1999 | +AC_MSG_CHECKING(for libotr3 LIBS) |
327 | +if test "$libotr3_prefix" != "" ; then | ||
328 | + LIBOTR3_LIBS="$LIBOTR3_LIBS -L$libotr3_prefix" | ||
329 | + LDFLAGS="$LDFLAGS $LIBOTR3_LIBS" | ||
330 | niro | 2000 | +fi |
331 | + | ||
332 | niro | 1999 | +dnl add the libotr3 library |
333 | +LIBOTR3_LIBS="$LIBOTR3_LIBS -lotr3" | ||
334 | +LIBS="$LIBOTR3_LIBS $LIBS" | ||
335 | +AC_MSG_RESULT($LIBOTR3_LIBS) | ||
336 | + | ||
337 | +dnl Check for a working version of libotr3 that is of the right version. | ||
338 | +min_libotr3_version=ifelse([$1], ,3.0.0,$1) | ||
339 | +no_libotr3="" | ||
340 | + libotr3_min_major_version=`echo $min_libotr3_version | \ | ||
341 | niro | 2000 | + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` |
342 | niro | 1999 | + libotr3_min_minor_version=`echo $min_libotr3_version | \ |
343 | niro | 2000 | + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` |
344 | niro | 1999 | + libotr3_min_sub_version=`echo $min_libotr3_version | \ |
345 | niro | 2000 | + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` |
346 | niro | 1999 | +AC_MSG_CHECKING(for libotr3 headers version $libotr3_min_major_version.x >= $min_libotr3_version) |
347 | niro | 2000 | + |
348 | +AC_LANG_SAVE | ||
349 | +AC_LANG_C | ||
350 | +AC_TRY_COMPILE([ | ||
351 | +#include <stdlib.h> | ||
352 | niro | 1999 | +#include <libotr3/version.h> |
353 | niro | 2000 | +], [ |
354 | niro | 1999 | +# if(OTRL_VERSION_MAJOR != $libotr3_min_major_version) |
355 | niro | 2000 | +# error not present |
356 | +# else | ||
357 | + | ||
358 | niro | 1999 | +# if(OTRL_VERSION_MINOR > $libotr3_min_minor_version) |
359 | niro | 2000 | + exit(0); |
360 | +# else | ||
361 | niro | 1999 | +# if(OTRL_VERSION_MINOR < $libotr3_min_minor_version) |
362 | niro | 2000 | +# error not present |
363 | +# endif | ||
364 | + | ||
365 | niro | 1999 | +# if(OTRL_VERSION_SUB < $libotr3_min_sub_version) |
366 | niro | 2000 | +# error not present |
367 | +# endif | ||
368 | +# endif | ||
369 | +# endif | ||
370 | +exit(0); | ||
371 | +], | ||
372 | + [AC_MSG_RESULT(found.)], | ||
373 | + [AC_MSG_RESULT(not present.) | ||
374 | niro | 1999 | + ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr3 not found.)]) |
375 | + libotr3_found=no] | ||
376 | niro | 2000 | +) |
377 | +AC_LANG_RESTORE | ||
378 | + | ||
379 | +dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. | ||
380 | niro | 1999 | +AC_CHECK_LIB([otr3], [otrl_message_receiving],, |
381 | + [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr3 was found.)]) | ||
382 | + libotr3_found=no], | ||
383 | niro | 2000 | + $LIBGCRYPT_LIBS |
384 | +) | ||
385 | + | ||
386 | niro | 1999 | +LDFLAGS="$libotr3_save_LDFLAGS" |
387 | +LIBS="$libotr3_save_LIBS" | ||
388 | niro | 2000 | + |
389 | niro | 1999 | +if test "x$libotr3_found" = "xyes" ; then |
390 | niro | 2000 | + ifelse([$2], , :, [$2]) |
391 | +else | ||
392 | niro | 1999 | + LIBOTR3_CFLAGS="" |
393 | + LIBOTR3_LIBS="" | ||
394 | niro | 2000 | + ifelse([$3], , :, [$3]) |
395 | +fi | ||
396 | + | ||
397 | +dnl That should be it. Now just export our symbols: | ||
398 | niro | 1999 | +AC_SUBST(LIBOTR3_CFLAGS) |
399 | +AC_SUBST(LIBOTR3_LIBS) | ||
400 | niro | 2000 | +]) |
401 | + | ||
402 | niro | 1999 | diff -Naur libotr-3.2.1/libotr3.pc.in libotr-3.2.1-magellan/libotr3.pc.in |
403 | --- libotr-3.2.1/libotr3.pc.in 1970-01-01 01:00:00.000000000 +0100 | ||
404 | +++ libotr-3.2.1-magellan/libotr3.pc.in 2012-12-21 16:01:02.654995318 +0100 | ||
405 | @@ -0,0 +1,11 @@ | ||
406 | +prefix=@prefix@ | ||
407 | +exec_prefix=@exec_prefix@ | ||
408 | +libdir=@libdir@ | ||
409 | +includedir=@includedir@ | ||
410 | + | ||
411 | +Name: libotr3 | ||
412 | +Description: Off-the-Record Messaging Library | ||
413 | +Version: 3.1.0 | ||
414 | +URL: http://otr.cypherpunks.ca/ | ||
415 | +Libs: -L${libdir} -lotr3 | ||
416 | +Cflags: -I${includedir} | ||
417 | diff -Naur libotr-3.2.1/src/Makefile.am libotr-3.2.1-magellan/src/Makefile.am | ||
418 | niro | 2001 | --- libotr-3.2.1/src/Makefile.am 2012-08-14 14:15:56.000000000 +0200 |
419 | niro | 1999 | +++ libotr-3.2.1-magellan/src/Makefile.am 2012-12-21 16:20:24.685302839 +0100 |
420 | niro | 2001 | @@ -1,13 +1,13 @@ |
421 | INCLUDES = @LIBGCRYPT_CFLAGS@ | ||
422 | |||
423 | -lib_LTLIBRARIES = libotr.la | ||
424 | niro | 1999 | +lib_LTLIBRARIES = libotr3.la |
425 | niro | 2001 | |
426 | -libotr_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \ | ||
427 | niro | 1999 | +libotr3_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \ |
428 | niro | 2001 | userstate.c tlv.c auth.c sm.c |
429 | |||
430 | -libotr_la_LDFLAGS = -version-info @LIBOTR_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@ | ||
431 | niro | 1999 | +libotr3_la_LDFLAGS = -version-info @LIBOTR3_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@ |
432 | niro | 2001 | |
433 | -otrincdir = $(includedir)/libotr | ||
434 | niro | 1999 | +otrincdir = $(includedir)/libotr3 |
435 | niro | 2001 | |
436 | otrinc_HEADERS = b64.h context.h dh.h mem.h message.h privkey.h proto.h \ | ||
437 | version.h userstate.h tlv.h serial.h auth.h sm.h privkey-t.h | ||
438 | niro | 1999 | diff -Naur libotr-3.2.1/src/Makefile.in libotr-3.2.1-magellan/src/Makefile.in |
439 | niro | 2001 | --- libotr-3.2.1/src/Makefile.in 2012-08-14 15:02:04.000000000 +0200 |
440 | niro | 1999 | +++ libotr-3.2.1-magellan/src/Makefile.in 2012-12-21 16:22:19.721334893 +0100 |
441 | niro | 2001 | @@ -69,13 +69,13 @@ |
442 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | ||
443 | am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(otrincdir)" | ||
444 | LTLIBRARIES = $(lib_LTLIBRARIES) | ||
445 | -libotr_la_LIBADD = | ||
446 | -am_libotr_la_OBJECTS = privkey.lo context.lo proto.lo b64.lo dh.lo \ | ||
447 | niro | 1999 | +libotr3_la_LIBADD = |
448 | +am_libotr3_la_OBJECTS = privkey.lo context.lo proto.lo b64.lo dh.lo \ | ||
449 | niro | 2001 | mem.lo message.lo userstate.lo tlv.lo auth.lo sm.lo |
450 | -libotr_la_OBJECTS = $(am_libotr_la_OBJECTS) | ||
451 | -libotr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
452 | niro | 1999 | +libotr3_la_OBJECTS = $(am_libotr3_la_OBJECTS) |
453 | +libotr3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
454 | niro | 2001 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
455 | - $(libotr_la_LDFLAGS) $(LDFLAGS) -o $@ | ||
456 | niro | 1999 | + $(libotr3_la_LDFLAGS) $(LDFLAGS) -o $@ |
457 | niro | 2001 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
458 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
459 | am__depfiles_maybe = depfiles | ||
460 | @@ -89,8 +89,8 @@ | ||
461 | LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
462 | --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | ||
463 | $(LDFLAGS) -o $@ | ||
464 | -SOURCES = $(libotr_la_SOURCES) | ||
465 | -DIST_SOURCES = $(libotr_la_SOURCES) | ||
466 | niro | 1999 | +SOURCES = $(libotr3_la_SOURCES) |
467 | +DIST_SOURCES = $(libotr3_la_SOURCES) | ||
468 | niro | 2001 | HEADERS = $(otrinc_HEADERS) |
469 | ETAGS = etags | ||
470 | CTAGS = ctags | ||
471 | @@ -130,7 +130,7 @@ | ||
472 | LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ | ||
473 | LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ | ||
474 | LIBOBJS = @LIBOBJS@ | ||
475 | -LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@ | ||
476 | niro | 1999 | +LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@ |
477 | niro | 2001 | LIBS = @LIBS@ |
478 | LIBTOOL = @LIBTOOL@ | ||
479 | LIPO = @LIPO@ | ||
480 | @@ -211,12 +211,12 @@ | ||
481 | top_builddir = @top_builddir@ | ||
482 | top_srcdir = @top_srcdir@ | ||
483 | INCLUDES = @LIBGCRYPT_CFLAGS@ | ||
484 | -lib_LTLIBRARIES = libotr.la | ||
485 | -libotr_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \ | ||
486 | niro | 1999 | +lib_LTLIBRARIES = libotr3.la |
487 | +libotr3_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \ | ||
488 | niro | 2001 | userstate.c tlv.c auth.c sm.c |
489 | |||
490 | -libotr_la_LDFLAGS = -version-info @LIBOTR_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@ | ||
491 | -otrincdir = $(includedir)/libotr | ||
492 | niro | 1999 | +libotr3_la_LDFLAGS = -version-info @LIBOTR3_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@ |
493 | +otrincdir = $(includedir)/libotr3 | ||
494 | niro | 2001 | otrinc_HEADERS = b64.h context.h dh.h mem.h message.h privkey.h proto.h \ |
495 | version.h userstate.h tlv.h serial.h auth.h sm.h privkey-t.h | ||
496 | |||
497 | @@ -285,8 +285,8 @@ | ||
498 | echo "rm -f \"$${dir}/so_locations\""; \ | ||
499 | rm -f "$${dir}/so_locations"; \ | ||
500 | done | ||
501 | -libotr.la: $(libotr_la_OBJECTS) $(libotr_la_DEPENDENCIES) | ||
502 | - $(libotr_la_LINK) -rpath $(libdir) $(libotr_la_OBJECTS) $(libotr_la_LIBADD) $(LIBS) | ||
503 | niro | 1999 | +libotr3.la: $(libotr3_la_OBJECTS) $(libotr3_la_DEPENDENCIES) |
504 | + $(libotr3_la_LINK) -rpath $(libdir) $(libotr3_la_OBJECTS) $(libotr3_la_LIBADD) $(LIBS) | ||
505 | niro | 2001 | |
506 | mostlyclean-compile: | ||
507 | -rm -f *.$(OBJEXT) | ||
508 | niro | 1999 | diff -Naur libotr-3.2.1/toolkit/Makefile.am libotr-3.2.1-magellan/toolkit/Makefile.am |
509 | niro | 2001 | --- libotr-3.2.1/toolkit/Makefile.am 2012-05-03 15:52:22.000000000 +0200 |
510 | niro | 1999 | +++ libotr-3.2.1-magellan/toolkit/Makefile.am 2012-12-21 16:23:21.561353776 +0100 |
511 | niro | 2001 | @@ -6,7 +6,7 @@ |
512 | otr_modify otr_remac | ||
513 | |||
514 | COMMON_S = parse.c sha1hmac.c | ||
515 | -COMMON_LD = ../src/libotr.la @LIBS@ @LIBGCRYPT_LIBS@ | ||
516 | niro | 1999 | +COMMON_LD = ../src/libotr3.la @LIBS@ @LIBGCRYPT_LIBS@ |
517 | niro | 2001 | |
518 | otr_parse_SOURCES = otr_parse.c readotr.c $(COMMON_S) | ||
519 | otr_parse_LDADD = $(COMMON_LD) | ||
520 | niro | 1999 | diff -Naur libotr-3.2.1/toolkit/Makefile.in libotr-3.2.1-magellan/toolkit/Makefile.in |
521 | niro | 2001 | --- libotr-3.2.1/toolkit/Makefile.in 2012-08-14 15:02:04.000000000 +0200 |
522 | niro | 1999 | +++ libotr-3.2.1-magellan/toolkit/Makefile.in 2012-12-21 16:25:16.011383871 +0100 |
523 | niro | 2001 | @@ -55,7 +55,7 @@ |
524 | am_otr_mackey_OBJECTS = otr_mackey.$(OBJEXT) sesskeys.$(OBJEXT) \ | ||
525 | $(am__objects_1) | ||
526 | otr_mackey_OBJECTS = $(am_otr_mackey_OBJECTS) | ||
527 | -am__DEPENDENCIES_1 = ../src/libotr.la | ||
528 | niro | 1999 | +am__DEPENDENCIES_1 = ../src/libotr3.la |
529 | niro | 2001 | otr_mackey_DEPENDENCIES = $(am__DEPENDENCIES_1) |
530 | am_otr_modify_OBJECTS = otr_modify.$(OBJEXT) readotr.$(OBJEXT) \ | ||
531 | $(am__objects_1) | ||
532 | @@ -159,7 +159,7 @@ | ||
533 | LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ | ||
534 | LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ | ||
535 | LIBOBJS = @LIBOBJS@ | ||
536 | -LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@ | ||
537 | niro | 1999 | +LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@ |
538 | niro | 2001 | LIBS = @LIBS@ |
539 | LIBTOOL = @LIBTOOL@ | ||
540 | LIPO = @LIPO@ | ||
541 | @@ -242,7 +242,7 @@ | ||
542 | INCLUDES = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@ | ||
543 | noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h | ||
544 | COMMON_S = parse.c sha1hmac.c | ||
545 | -COMMON_LD = ../src/libotr.la @LIBS@ @LIBGCRYPT_LIBS@ | ||
546 | niro | 1999 | +COMMON_LD = ../src/libotr3.la @LIBS@ @LIBGCRYPT_LIBS@ |
547 | niro | 2001 | otr_parse_SOURCES = otr_parse.c readotr.c $(COMMON_S) |
548 | otr_parse_LDADD = $(COMMON_LD) | ||
549 | otr_sesskeys_SOURCES = otr_sesskeys.c sesskeys.c $(COMMON_S) |