ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/configure.ac
(Generate patch)

Comparing gvpe/configure.ac (file contents):
Revision 1.36 by pcg, Thu Mar 17 23:59:37 2005 UTC vs.
Revision 1.64 by root, Thu Jan 29 00:21:39 2015 UTC

1dnl Process this file with autoconf to produce a configure script. 1dnl Process this file with autoconf to produce a configure script.
2 2
3AC_PREREQ(2.59) 3AC_PREREQ(2.69)
4AC_INIT 4AC_INIT
5AC_CONFIG_SRCDIR([src/vped.C]) 5AC_CONFIG_SRCDIR([src/gvpe.C])
6AC_CANONICAL_TARGET 6AC_CANONICAL_TARGET
7AM_INIT_AUTOMAKE(gvpe, 1.8) 7AM_INIT_AUTOMAKE(gvpe, 2.25)
8AC_CONFIG_HEADERS([config.h]) 8AC_CONFIG_HEADERS([config.h])
9AM_MAINTAINER_MODE 9AM_MAINTAINER_MODE
10 10
11AH_TOP([ 11AH_TOP([
12#ifndef CONFIG_H__ 12#ifndef CONFIG_H__
… …
38typedef int16_t s16; 38typedef int16_t s16;
39typedef int32_t s32; 39typedef int32_t s32;
40#endif 40#endif
41 41
42#endif 42#endif
43])
44 43
45dnl Include the macros from the m4/ directory 44#if HAVE_CLOCALE
46AM_ACLOCAL_INCLUDE(m4) 45# define CLOCALE <clocale>
46#else
47# define CLOCALE <locale.h>
48#endif
49])
47 50
48AM_GNU_GETTEXT([external]) 51AM_GNU_GETTEXT([external])
49AM_GNU_GETTEXT_VERSION(0.11.5) 52AM_GNU_GETTEXT_VERSION(0.11.5)
50 53
51# Enable GNU extensions. 54# Enable GNU extensions.
52# Define this here, not in acconfig's @TOP@ section, since definitions 55# Define this here, not in acconfig's @TOP@ section, since definitions
53# in the latter don't make it into the configure-time tests. 56# in the latter don't make it into the configure-time tests.
54AC_DEFINE([_GNU_SOURCE], 1, [Enable GNU extenstions]) 57AC_DEFINE([_GNU_SOURCE], 1, [Enable GNU extensions])
55 58
56# do NOT define POSIX_SOURCE, sicne this clashes with many BSDs 59# do NOT define POSIX_SOURCE, sicne this clashes with many BSDs
57dnl AC_DEFINE([_POSIX_SOURCE], 1, [Enable POSIX 1003.1 extensions]) 60dnl AC_DEFINE([_POSIX_SOURCE], 1, [Enable POSIX 1003.1 extensions])
58dnl AC_DEFINE([_XOPEN_SOURCE], 500, [Enable XOPEN extensions]) 61dnl AC_DEFINE([_XOPEN_SOURCE], 500, [Enable XOPEN extensions])
59 62
60ALL_LINGUAS="" 63ALL_LINGUAS=""
61 64
62dnl Checks for programs. 65dnl Checks for programs.
63AC_PROG_CC
64AC_PROG_CPP 66AC_PROG_CPP
65AC_PROG_CXX 67AC_PROG_CXX
66AC_PROG_GCC_TRADITIONAL 68AC_PROG_GCC_TRADITIONAL
67AC_PROG_AWK 69AC_PROG_AWK
68AC_PROG_INSTALL 70AC_PROG_INSTALL
… …
71AC_PROG_RANLIB 73AC_PROG_RANLIB
72 74
73AC_ARG_ENABLE(iftype, 75AC_ARG_ENABLE(iftype,
74 [AS_HELP_STRING(--enable-iftype=TYPE/SUBTYPE, 76 [AS_HELP_STRING(--enable-iftype=TYPE/SUBTYPE,
75 Use kernel/net device interface TYPE/SUBTYPE. 77 Use kernel/net device interface TYPE/SUBTYPE.
76 Working combinations are: 78 Working combinations are (see doc/gvpe.osdep.5.pod):
77 "native/linux" 79 "native/linux"
78 "tincd/linux" 80 "tincd/linux"
81 "tincd/netbsd"
79 "tincd/freebsd" 82 "tincd/freebsd"
80 "tincd/openbsd" 83 "tincd/openbsd"
84 "native/darwin"
81 "tincd/darwin" 85 "tincd/darwin"
82 "native/cygwin"; 86 "native/cygwin";
83 Untested combinations are: 87 Untested combinations are:
84 "tincd/netbsd" 88 "tincd/bsd"
85 "tincd/solaris" 89 "tincd/solaris"
86 "tincd/mingw" 90 "tincd/mingw"
87 "tincd/raw_socket" 91 "tincd/raw_socket"
88 "tincd/uml_socket"; 92 "tincd/uml_socket";
89 Broken combinations are: 93 Broken combinations are:
… …
110 IFTYPE=tincd 114 IFTYPE=tincd
111 IFSUBTYPE=freebsd 115 IFSUBTYPE=freebsd
112 AC_DEFINE(HAVE_FREEBSD, 1, [FreeBSD]) 116 AC_DEFINE(HAVE_FREEBSD, 1, [FreeBSD])
113 ;; 117 ;;
114 *darwin*) 118 *darwin*)
115 IFTYPE=tincd 119 IFTYPE=native
116 IFSUBTYPE=darwin 120 IFSUBTYPE=darwin
117 AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)]) 121 AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)])
118 ;; 122 ;;
119 *solaris*) 123 *solaris*)
120 IFTYPE=tincd 124 IFTYPE=tincd
… …
150AC_CACHE_SAVE 154AC_CACHE_SAVE
151 155
152dnl Checks for libraries. 156dnl Checks for libraries.
153 157
154AC_LANG(C++) 158AC_LANG(C++)
155AC_CHECK_HEADERS(ext/hash_map) 159AC_CHECK_HEADERS(tr1/unordered_map ext/hash_map clocale)
156 160
157dnl Checks for header files. 161dnl Checks for header files.
158AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \ 162AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \
159 sys/file.h sys/ioctl.h sys/param.h sys/time.h netinet/in_systm.h sys/cygwin.h \ 163 sys/file.h sys/ioctl.h sys/param.h sys/time.h netinet/in_systm.h sys/cygwin.h \
160 sys/mman.h netinet/in.h]) 164 sys/mman.h netinet/in.h])
… …
218]) 222])
219AC_CHECK_FUNC(gethostbyname, [], [ 223AC_CHECK_FUNC(gethostbyname, [], [
220 AC_CHECK_LIB(nsl, gethostbyname) 224 AC_CHECK_LIB(nsl, gethostbyname)
221]) 225])
222 226
227dnl libev support
228m4_include([libev/libev.m4])
229
223AC_LANG_POP 230AC_LANG_POP
224 231
225dnl AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo]) 232dnl AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo])
226 233
227AC_CACHE_SAVE 234AC_CACHE_SAVE
… …
233if test "x$openssl_include" != x; then 240if test "x$openssl_include" != x; then
234 CXXFLAGS="$CXXFLAGS -I$openssl_include" 241 CXXFLAGS="$CXXFLAGS -I$openssl_include"
235fi 242fi
236dnl tinc_ZLIB 243dnl tinc_ZLIB
237 244
245AC_ARG_ENABLE(threads,
246 [AS_HELP_STRING(--enable-threads,try to use threads for long-running asynchronous operations (default enabled).)],
247 [try_threads=$enableval],
248 [try_threads=yes]
249)
250
251if test "x$try_threads" = xyes; then
252 AC_CHECK_HEADER(pthread.h,[
253 LIBS="$LIBS -lpthread"
254 AC_COMPILE_IFELSE(
255 [AC_LANG_PROGRAM([#include <pthread.h>], [pthread_t id; pthread_create (&id, 0, 0, 0);])],
256 [AC_DEFINE_UNQUOTED(ENABLE_PTHREADS, 1, [POSIX thread support.])]
257 )
258 ])
259fi
260
238AC_ARG_ENABLE(static-daemon, 261AC_ARG_ENABLE(static-daemon,
239 [AS_HELP_STRING(--enable-static-daemon,enable statically linked daemon.)], 262 [AS_HELP_STRING(--enable-static-daemon,enable statically linked daemon.)],
240 [LDFLAGS_DAEMON=-static] 263 [LDFLAGS_DAEMON=-static]
241) 264)
242AC_SUBST(LDFLAGS_DAEMON) 265AC_SUBST(LDFLAGS_DAEMON)
243 266
244AC_ARG_ENABLE(rohc, 267dnl AC_ARG_ENABLE(rohc,
245 [AS_HELP_STRING(--enable-rohc,enable robust header compression (rfc3095).)], 268dnl [AS_HELP_STRING(--enable-rohc,enable robust header compression (rfc3095).)],
246 [ 269dnl [
247 echo 270dnl echo
248 echo "**********************************************************************" 271dnl echo "**********************************************************************"
249 echo "**********************************************************************" 272dnl echo "**********************************************************************"
250 echo "**** --enable-rohc is highly experimental, do not use ****************" 273dnl echo "**** --enable-rohc is highly experimental, do not use ****************"
251 echo "**********************************************************************" 274dnl echo "**********************************************************************"
252 echo "**********************************************************************" 275dnl echo "**********************************************************************"
253 echo 276dnl echo
254 rohc=true 277dnl rohc=true
255 AC_DEFINE_UNQUOTED(ENABLE_ROHC, 1, [ROHC support]) 278dnl AC_DEFINE_UNQUOTED(ENABLE_ROHC, 1, [ROHC support])
256 ] 279dnl ]
257) 280dnl )
258 281
259AM_CONDITIONAL(ROHC, test x$rohc = xtrue) 282AM_CONDITIONAL(ROHC, test x$rohc = xtrue)
260 283
284dnl AC_ARG_ENABLE(bridging,
285dnl [AS_HELP_STRING(--enable-bridging,enable bridging support (default disabled).)],
286dnl AC_DEFINE_UNQUOTED(ENABLE_BRIDGING, 1, [bridging support.])
287dnl )
288
289ICMP=1
261AC_ARG_ENABLE(icmp, 290AC_ARG_ENABLE(icmp,
262 [AS_HELP_STRING(--enable-icmp,enable icmp protocol support (default disabled).)], 291 [AS_HELP_STRING(--disable-icmp,enable icmp protocol support (default enabled).)],
292 if test "x$enableval" = xno; then
293 ICMP=0
294 fi
295)
296if test "x$ICMP" = x1; then
263 AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.]) 297 AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.])
264) 298fi
265 299
300TCP=1
266AC_ARG_ENABLE(tcp, 301AC_ARG_ENABLE(tcp,
267 [AS_HELP_STRING(--enable-tcp,enable tcp protocol support (default disabled).)], 302 [AS_HELP_STRING(--disable-tcp,enable tcp protocol support (default enabled).)],
303 if test "x$enableval" = xno; then
304 TCP=0
305 fi
306)
307if test "x$TCP" = x1; then
268 AC_DEFINE_UNQUOTED(ENABLE_TCP, 1, [TCP protocol support.]) 308 AC_DEFINE_UNQUOTED(ENABLE_TCP, 1, [TCP protocol support.])
309fi
310
311HTTP=1
312AC_ARG_ENABLE(http-proxy,
313 [AS_HELP_STRING(--disable-http-proxy,enable http proxy connect support (default enabled).)],
314 if test "x$enableval" = xno; then
315 HTTP=0
316 fi
269) 317)
318if test "x$HTTP" = x1; then
319 AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.])
320fi
270 321
271AC_ARG_ENABLE(dns, 322AC_ARG_ENABLE(dns,
272 [AS_HELP_STRING(--enable-dns,enable dns tunnel protocol support (DOES NOT WORK).)], 323 [AS_HELP_STRING(--enable-dns,enable dns tunnel protocol support (default disabled).)],
273 [ 324 [
274 AC_CHECK_HEADER(gmp.h,,[AC_MSG_ERROR([gmp.h not found, required for --enable-dns])]) 325 AC_CHECK_HEADER(gmp.h,,[AC_MSG_ERROR([gmp.h not found, required for --enable-dns])])
275 AC_CHECK_LIB(gmp,main,,[AC_MSG_ERROR([libgmp not found, required for --enable-dns])]) 326 AC_CHECK_LIB(gmp,main,,[AC_MSG_ERROR([libgmp not found, required for --enable-dns])])
276 327
277 AC_DEFINE_UNQUOTED(ENABLE_DNS, 1, [DNS tunnel protocol support.]) 328 AC_DEFINE_UNQUOTED(ENABLE_DNS, 1, [DNS tunnel protocol support.])
278 ] 329 ]
279) 330)
280 331
281AC_ARG_ENABLE(http-proxy, 332RSA=3072
282 [AS_HELP_STRING(--enable-http-proxy,enable http proxy connect support (default disabled).)], 333AC_ARG_ENABLE(rsa-length,
283 AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.]) 334 [AS_HELP_STRING(--enable-rsa-length=BITS,[
335 use BITS rsa keys (default 3072). Allowed values are 2048-10240.])],
336 RSA=$enableval
284) 337)
338AC_DEFINE_UNQUOTED(RSABITS, $RSA, [Size of RSA keys.])
285 339
286HMAC=12 340HMACSIZE=12
287AC_ARG_ENABLE(hmac-length, 341AC_ARG_ENABLE(hmac-length,
288 [AS_HELP_STRING(--enable-hmac-length=BYTES,[ 342 [AS_HELP_STRING(--enable-hmac-length=BYTES,[
289 use a hmac of length BYTES bytes (default 12). Allowed values are 4, 8, 12, 16.])], 343 use a hmac of length BYTES bytes (default 12). Allowed values are 4, 8, 12, 16.])],
290 HMAC=$enableval 344 HMACSIZE=$enableval
291) 345)
292AC_DEFINE_UNQUOTED(HMACLENGTH, $HMAC, [Size of HMAC in each packet in bytes.]) 346AC_DEFINE_UNQUOTED(HMACLENGTH, $HMACSIZE, [Size of HMAC in each packet in bytes.])
293
294RAND=8
295AC_ARG_ENABLE(rand-length,
296 [AS_HELP_STRING(--enable-rand-length=BYTES,
297 [use BYTES bytes of extra randomness (default 8). Allowed values are 0, 4, 8.])],
298 RAND=$enableval
299)
300AC_DEFINE_UNQUOTED(RAND_SIZE, $RAND, [Add this many bytes of randomness to each packet.])
301 347
302MTU=1500 348MTU=1500
303AC_ARG_ENABLE(mtu, 349AC_ARG_ENABLE(max-mtu,
304 [AS_HELP_STRING(--enable-max-mtu=BYTES,enable mtu sizes upto BYTES bytes (default 1500). Use 9100 for jumbogram support.)], 350 [AS_HELP_STRING(--enable-max-mtu=BYTES,enable mtu sizes upto BYTES bytes (default 1500). Use 9100 for jumbogram support.)],
305 MTU=$enableval 351 MTU=$enableval
306) 352)
307AC_DEFINE_UNQUOTED(MAX_MTU, $MTU + 14, [Maximum MTU supported.]) 353AC_DEFINE_UNQUOTED(MAX_MTU, ($MTU + 14), [Maximum MTU supported.])
308 354
309COMPRESS=1 355COMPRESS=1
310AC_ARG_ENABLE(compression, 356AC_ARG_ENABLE(compression,
311 [AS_HELP_STRING(--disable-compression,Disable compression support.)], 357 [AS_HELP_STRING(--disable-compression,Disable compression support.)],
312 if test "x$enableval" = xno; then 358 if test "x$enableval" = xno; then
313 COMPRESS=0 359 COMPRESS=0
314 fi 360 fi
315) 361)
316AC_DEFINE_UNQUOTED(ENABLE_COMPRESSION, $COMPRESS, [Enable compression support.]) 362AC_DEFINE_UNQUOTED(ENABLE_COMPRESSION, $COMPRESS, [Enable compression support.])
317 363
318CIPHER=bf_cbc 364CIPHER=aes_128_ctr
319AC_ARG_ENABLE(cipher, 365AC_ARG_ENABLE(cipher,
320 [AS_HELP_STRING(--enable-cipher,[ 366 [AS_HELP_STRING(--enable-cipher=CIPHER,[
321 Select the symmetric cipher (default "bf"). 367 Select the symmetric cipher (default "aes-128").
322 Must be one of "bf" (blowfish), "aes-128" (rijndael), "aes-192" or "aes-256".])], 368 Must be one of "aes-128" (rijndael), "aes-192", or "aes-256".])],
323 if test "x$enableval" = xbf ; then CIPHER=bf_cbc ; fi 369 #if test "x$enableval" = xbf ; then CIPHER=bf_ctr ; fi
324 if test "x$enableval" = xaes-128; then CIPHER=aes_128_cbc; fi 370 if test "x$enableval" = xaes-128 ; then CIPHER=aes_128_ctr ; fi
325 if test "x$enableval" = xaes-192; then CIPHER=aes_192_cbc; fi 371 if test "x$enableval" = xaes-192 ; then CIPHER=aes_192_ctr ; fi
326 if test "x$enableval" = xaes-256; then CIPHER=aes_256_cbc; fi 372 if test "x$enableval" = xaes-256 ; then CIPHER=aes_256_ctr ; fi
373 #if test "x$enableval" = xcamellia-128; then CIPHER=camellia_128_ctr; fi
374 #if test "x$enableval" = xcamellia-256; then CIPHER=camellia_256_ctr; fi
327) 375)
328AC_DEFINE_UNQUOTED(ENABLE_CIPHER, EVP_${CIPHER}, [Select the symmetric cipher to use.]) 376AC_DEFINE_UNQUOTED(ENABLE_CIPHER, EVP_${CIPHER}, [Select the symmetric cipher to use.])
329 377
330DIGEST=sha1 378HMAC=sha1
331AC_ARG_ENABLE(digest, 379AC_ARG_ENABLE(hmac-digest,
332 [AS_HELP_STRING(--enable-digest,[ 380 [AS_HELP_STRING(--enable-hmac-digest=HMAC,[
333 Select the digets algorithm to use (default "sha1"). Must be one of 381 Select the HMAC digest algorithm to use (default "sha1"). Must be one of
334 "sha1", "ripemd160", "md5" or "md4" (insecure).])], 382 "sha512", "sha256", "sha1", "ripemd160", "whirlpool".])],
383 if test "x$enableval" = xwhirlpool; then HMAC=whirlpool; fi
384 if test "x$enableval" = xsha512 ; then HMAC=sha512 ; fi
385 if test "x$enableval" = xsha256 ; then HMAC=sha256 ; fi
335 if test "x$enableval" = xsha1 ; then DIGEST=sha1 ; fi 386 if test "x$enableval" = xsha1 ; then HMAC=sha1 ; fi
336 if test "x$enableval" = xripemd160; then DIGEST=ripemd160; fi 387 if test "x$enableval" = xripemd160; then HMAC=ripemd160; fi
388)
389AC_DEFINE_UNQUOTED(ENABLE_HMAC, EVP_${HMAC}, [Select the HMAC digest algorithm to use.])
390
391AUTH=sha512
392AC_ARG_ENABLE(auth-digest,
393 [AS_HELP_STRING(--enable-auth-digest=DIGEST,[
394 Select the hmac algorithm to use (default "sha512"). Must be one of
395 "sha512", "sha256", "whirlpool".])],
396 if test "x$enableval" = xwhirlpool; then AUTH=whirlpool; fi
337 if test "x$enableval" = xmd5 ; then DIGEST=md5 ; fi 397 if test "x$enableval" = xsha512 ; then AUTH=sha512 ; fi
338 if test "x$enableval" = xmd4 ; then DIGEST=md4 ; fi 398 if test "x$enableval" = xsha256 ; then AUTH=sha256 ; fi
339) 399)
340AC_DEFINE_UNQUOTED(ENABLE_DIGEST, EVP_${DIGEST}, [Select the digest algorithm to use.]) 400AC_DEFINE_UNQUOTED(ENABLE_AUTH, EVP_${AUTH}, [Select the auth digest algorithm to use.])
341 401
342if $CXX -v --help 2>&1 | grep -q fno-rtti; then 402if $CXX -v --help 2>&1 | grep -q fno-rtti; then
343 CXXFLAGS="$CXXFLAGS -fno-rtti" 403 CXXFLAGS="$CXXFLAGS -fno-rtti"
344fi 404fi
345 405
346if $CXX -v --help 2>&1 | grep -q fexceptions; then 406#if $CXX -v --help 2>&1 | grep -q fexceptions; then
347 CXXFLAGS="$CXXFLAGS -fno-exceptions" 407# CXXFLAGS="$CXXFLAGS -fno-exceptions"
348fi 408#fi
409
410LIBS="$EXTRA_LIBS $LIBS"
349 411
350dnl if $CXX -v --help 2>&1 | grep -q ffunction-sections; then 412dnl if $CXX -v --help 2>&1 | grep -q ffunction-sections; then
351dnl CXXFLAGS="$CXXFLAGS -ffunction-sections" 413dnl CXXFLAGS="$CXXFLAGS -ffunction-sections"
352dnl fi 414dnl fi
353dnl 415dnl
354dnl if $LD -v --help 2>&1 | grep -q gc-sections; then 416dnl if $LD -v --help 2>&1 | grep -q gc-sections; then
355dnl LDFLAGS="$LDFLAGS -Wl,--gc-sections" 417dnl LDFLAGS="$LDFLAGS -Wl,--gc-sections"
356dnl fi 418dnl fi
357 419
358AC_CONFIG_COMMANDS_POST([ 420AC_SUBST(INCLUDES)
421
422AC_CONFIG_FILES([Makefile po/Makefile.in
423src/Makefile
424doc/Makefile
425lib/Makefile
426m4/Makefile
427])
428AC_OUTPUT
359 429
360echo 430echo
361echo "***" 431echo "***"
362echo "*** Configuration Summary" 432echo "*** Configuration Summary"
363echo "***" 433echo "***"
364echo "*** Kernel Iface: $IFTYPE/$IFSUBTYPE" 434echo "*** Kernel Iface: $IFTYPE/$IFSUBTYPE"
435echo "*** RSA size: $RSA"
365echo "*** Cipher used: $CIPHER" 436echo "*** Cipher used: $CIPHER"
366echo "*** Digest used: $DIGEST" 437echo "*** Digest used: $DIGEST"
438echo "*** Authdigest: $AUTH"
367echo "*** HMAC length: $HMAC" 439echo "*** HMAC length: $HMAC"
368echo "*** RAND used: $RAND"
369echo "*** Max. MTU: $MTU" 440echo "*** Max. MTU: $MTU"
370echo "*** Compression: $COMPRESS"
371 441
372if test "x$DIGEST" = xmd4; then
373echo "***" 442echo "***"
374echo "*** WARNING: The digest you have chosen ($DIGEST) is known to be insecure" 443echo "*** Enable options:"
375fi 444grep ENABLE_ config.h | sed -e 's/^/*** /'
376 445
377if test "$HMAC" -lt 12; then 446if test "$HMACSIZE" -lt 12; then
378echo "***" 447echo "***"
379echo "*** WARNING: The hmac length you have chosen ($HMAC) is probably insecure" 448echo "*** WARNING: The hmac length you have chosen ($HMACSIZE) is quite insecure"
380fi 449fi
381 450
382if test "$RAND" -lt 8; then
383echo "***" 451echo "***"
384echo "*** WARNING: The random prefix you have chosen ($RAND) is probably insecure"
385fi
386
387echo "***"
388
389echo 452echo
390 453
391])
392 454
393AC_SUBST(INCLUDES)
394
395AC_CONFIG_FILES([Makefile po/Makefile.in
396src/Makefile
397doc/Makefile
398lib/Makefile
399m4/Makefile
400])
401AC_OUTPUT

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines