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