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

Comparing gvpe/configure.ac (file contents):
Revision 1.13 by pcg, Wed Oct 15 00:34:18 2003 UTC vs.
Revision 1.34 by pcg, Fri Mar 4 03:43:09 2005 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.57) 3AC_PREREQ(2.59)
4AC_INIT(src/vped.C) 4AC_INIT
5AC_CONFIG_SRCDIR([src/vped.C])
5AC_CANONICAL_TARGET 6AC_CANONICAL_TARGET
6AM_INIT_AUTOMAKE(vpe, 1.2) 7AM_INIT_AUTOMAKE(gvpe, 1.7)
7AM_CONFIG_HEADER(config.h) 8AC_CONFIG_HEADERS([config.h])
8AM_MAINTAINER_MODE 9AM_MAINTAINER_MODE
9 10
10AH_TOP([ 11AH_TOP([
11#ifndef CONFIG_H__ 12#ifndef CONFIG_H__
12#define CONFIG_H__ 13#define CONFIG_H__
… …
16#endif 17#endif
17 18
18]) 19])
19 20
20AH_BOTTOM([ 21AH_BOTTOM([
22typedef unsigned char u8;
23typedef signed char s8;
24
21#if __CYGWIN__ 25#if __CYGWIN__
22 26
23typedef unsigned char u8;
24typedef unsigned short u16; 27typedef unsigned short u16;
25typedef unsigned int u32; 28typedef unsigned int u32;
29typedef signed short s16;
30typedef signed int s32;
26 31
27#else 32#else
28#include <inttypes.h> 33#include <inttypes.h>
29 34
30/* old modula-2 habits */ 35/* old modula-2 habits */
31typedef unsigned char u8;
32typedef uint16_t u16; 36typedef uint16_t u16;
33typedef uint32_t u32; 37typedef uint32_t u32;
38typedef int16_t s16;
39typedef int32_t s32;
34#endif 40#endif
35 41
36#endif 42#endif
37]) 43])
38 44
… …
44 50
45# Enable GNU extensions. 51# Enable GNU extensions.
46# Define this here, not in acconfig's @TOP@ section, since definitions 52# Define this here, not in acconfig's @TOP@ section, since definitions
47# in the latter don't make it into the configure-time tests. 53# in the latter don't make it into the configure-time tests.
48AC_DEFINE([_GNU_SOURCE], 1, [Enable GNU extenstions]) 54AC_DEFINE([_GNU_SOURCE], 1, [Enable GNU extenstions])
49AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions]) 55
56# do NOT define POSIX_SOURCE, sicne this clashes with many BSDs
57dnl AC_DEFINE([_POSIX_SOURCE], 1, [Enable POSIX 1003.1 extensions])
58dnl AC_DEFINE([_XOPEN_SOURCE], 500, [Enable XOPEN extensions])
50 59
51ALL_LINGUAS="" 60ALL_LINGUAS=""
52 61
53dnl Checks for programs. 62dnl Checks for programs.
54AC_PROG_CC 63AC_PROG_CC
… …
59AC_PROG_INSTALL 68AC_PROG_INSTALL
60AC_PROG_LN_S 69AC_PROG_LN_S
61AC_PROG_MAKE_SET 70AC_PROG_MAKE_SET
62AC_PROG_RANLIB 71AC_PROG_RANLIB
63 72
64AC_ISC_POSIX
65
66AC_ARG_ENABLE(iftype, 73AC_ARG_ENABLE(iftype,
67 [AC_HELP_STRING(--enable-iftype[=TYPE/SUBTYPE], [ 74 [AS_HELP_STRING(--enable-iftype=TYPE/SUBTYPE,
68 Use kernel/net device interface TYPE/SUBTYPE. 75 Use kernel/net device interface TYPE/SUBTYPE.
69 Working combinations are: 76 Working combinations are:
70 "native/linux" "tincd/linux" "tincd/freebsd"; 77 "native/linux"
78 "tincd/linux"
79 "tincd/freebsd"
80 "tincd/openbsd"
81 "tincd/darwin"
82 "native/cygwin";
71 Untested combinations are: 83 Untested combinations are:
72 "tincd/netbsd" "tincd/darwin" "tincd/solaris" 84 "tincd/netbsd"
73 "tincd/openbsd" "tincd/cygwin"; 85 "tincd/solaris"
86 "tincd/mingw";
74 Broken combinations are: 87 Broken combinations are:
75 "native/cygwin"; 88 "tincd/cygwin";
76 The default is to autodetect. 89 The default is to autodetect.
77 ])], 90 )],
78 [ 91 [
79 IFTYPE=`echo $enableval | sed s%/.*%%` 92 IFTYPE=`echo $enableval | sed s%/.*%%`
80 IFSUBTYPE=`echo $enableval | sed s%.*/%%` 93 IFSUBTYPE=`echo $enableval | sed s%.*/%%`
81 ] 94 ]
82) 95)
… …
115 IFTYPE=tincd 128 IFTYPE=tincd
116 IFSUBTYPE=netbsd 129 IFSUBTYPE=netbsd
117 AC_DEFINE(HAVE_NETBSD, 1, [NetBSD]) 130 AC_DEFINE(HAVE_NETBSD, 1, [NetBSD])
118 ;; 131 ;;
119 *cygwin*) 132 *cygwin*)
120 IFTYPE=tincd 133 IFTYPE=native
121 IFSUBTYPE=cygwin 134 IFSUBTYPE=cygwin
122 AC_DEFINE(HAVE_CYGWIN, 1, [Cygwin]) 135 AC_DEFINE(HAVE_CYGWIN, 1, [Cygwin])
123 ;; 136 ;;
124 *) 137 *)
125 AC_MSG_ERROR("Unknown operating system.") 138 AC_MSG_ERROR("Unknown operating system.")
… …
127 esac 140 esac
128fi 141fi
129AC_MSG_RESULT($IFTYPE/$IFSUBTYPE) 142AC_MSG_RESULT($IFTYPE/$IFSUBTYPE)
130AC_SUBST(IFTYPE,$IFTYPE) 143AC_SUBST(IFTYPE,$IFTYPE)
131AC_SUBST(IFSUBTYPE,$IFSUBTYPE) 144AC_SUBST(IFSUBTYPE,$IFSUBTYPE)
145AC_DEFINE_UNQUOTED(IFTYPE,"$IFTYPE",[kernel interface type])
146AC_DEFINE_UNQUOTED(IFSUBTYPE,"$IFSUBTYPE",[kernel interface subtype])
132 147
133AC_CACHE_SAVE 148AC_CACHE_SAVE
134 149
135dnl Checks for libraries. 150dnl Checks for libraries.
136 151
137AC_LANG(C++) 152AC_LANG(C++)
138AC_CHECK_HEADERS(ext/hash_map) 153AC_CHECK_HEADERS(ext/hash_map)
139 154
140dnl Checks for header files. 155dnl Checks for header files.
141AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \ 156AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \
142 sys/file.h sys/ioctl.h sys/param.h sys/time.h netinet/in_systm.h cygwin.h arpa/inet.h \ 157 sys/file.h sys/ioctl.h sys/param.h sys/time.h netinet/in_systm.h sys/cygwin.h \
143 sys/poll.h sys/mman.h netinet/in.h]) 158 sys/mman.h netinet/in.h])
144AC_CHECK_HEADERS([net/ethernet.h net/if.h netinet/ip.h netinet/tcp.h netinet/in_systm.h], [], [], 159AC_CHECK_HEADERS([arpa/inet.h net/ethernet.h net/if.h netinet/ip.h netinet/tcp.h netinet/in_systm.h], [], [],
145[ 160[
146#include <sys/types.h> 161#include <sys/types.h>
147#include <sys/socket.h> 162#include <sys/socket.h>
148#ifdef HAVE_NETINET_IN_H 163#ifdef HAVE_NETINET_IN_H
149# include <netinet/in.h> 164# include <netinet/in.h>
… …
163AC_HEADER_TIME 178AC_HEADER_TIME
164AC_STRUCT_TM 179AC_STRUCT_TM
165 180
166AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t, 181AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
167[ 182[
168 AC_TRY_COMPILE( 183 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
169 [#include <sys/types.h> 184 #include <sys/socket.h>]], [[socklen_t len = 42; return len;]])],[ac_cv_type_socklen_t=yes],[ac_cv_type_socklen_t=no])
170 #include <sys/socket.h>],
171 [socklen_t len = 42; return len;],
172 ac_cv_type_socklen_t=yes,
173 ac_cv_type_socklen_t=no)
174]) 185])
175if test $ac_cv_type_socklen_t = yes; then 186if test $ac_cv_type_socklen_t = yes; then
176 AC_DEFINE(HAVE_SOCKLEN_T, 1, [socklen_t available]) 187 AC_DEFINE(HAVE_SOCKLEN_T, 1, [socklen_t available])
177fi 188fi
178 189
179AC_CACHE_CHECK([for struct addrinfo], ac_cv_struct_addrinfo, 190AC_CACHE_CHECK([for struct addrinfo], ac_cv_struct_addrinfo,
180[ 191[
181 AC_TRY_COMPILE( 192 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
182 [#include <sys/types.h>
183 #include <sys/socket.h> 193 #include <sys/socket.h>
184 #include <netdb.h>], 194 #include <netdb.h>]], [[struct addrinfo ai; ai.ai_family = AF_INET; return ai.ai_family;]])],[ac_cv_struct_addrinfo=yes],[ac_cv_struct_addrinfo=no])
185 [struct addrinfo ai; ai.ai_family = AF_INET; return ai.ai_family;],
186 ac_cv_struct_addrinfo=yes,
187 ac_cv_struct_addrinfo=no)
188]) 195])
189if test $ac_cv_struct_addrinfo = yes; then 196if test $ac_cv_struct_addrinfo = yes; then
190 AC_DEFINE(HAVE_STRUCT_ADDRINFO, 1, [struct addrinfo available]) 197 AC_DEFINE(HAVE_STRUCT_ADDRINFO, 1, [struct addrinfo available])
191fi 198fi
192 199
… …
196AC_LANG_PUSH(C) 203AC_LANG_PUSH(C)
197 204
198AC_HEADER_STDC 205AC_HEADER_STDC
199 206
200dnl argl, could somebody catapult darwin into the 21st century??? 207dnl argl, could somebody catapult darwin into the 21st century???
201AC_CHECK_FUNCS(asprintf daemon get_current_dir_name putenv select strerror strsignal strtol unsetenv mlockall poll) 208AC_CHECK_FUNCS(asprintf daemon get_current_dir_name putenv select strerror strsignal strtol unsetenv mlockall)
202 209
203AC_FUNC_ALLOCA 210AC_FUNC_ALLOCA
204 211
205dnl Support for SunOS 212dnl Support for SunOS
206 213
… …
217 224
218AC_CACHE_SAVE 225AC_CACHE_SAVE
219 226
220dnl These are defined in files in m4/ 227dnl These are defined in files in m4/
221tinc_TUNTAP 228tinc_TUNTAP
229
222tinc_OPENSSL 230tinc_OPENSSL
231if test "x$openssl_include" != x; then
223CXXFLAGS="$CXXFLAGS -I$openssl_include" 232 CXXFLAGS="$CXXFLAGS -I$openssl_include"
233fi
224dnl tinc_ZLIB 234dnl tinc_ZLIB
225 235
236AC_ARG_ENABLE(static-daemon,
237 [AS_HELP_STRING(--enable-static-daemon,enable statically linked daemon.)],
238 [LDFLAGS_DAEMON=-static]
239)
240AC_SUBST(LDFLAGS_DAEMON)
241
226AC_ARG_ENABLE(rohc, 242AC_ARG_ENABLE(rohc,
227 [AC_HELP_STRING(--enable-rohc, [enable robust header compression (rfc3095).])], 243 [AS_HELP_STRING(--enable-rohc,enable robust header compression (rfc3095).)],
228 [ 244 [
229 echo 245 echo
230 echo "**********************************************************************" 246 echo "**********************************************************************"
231 echo "**********************************************************************" 247 echo "**********************************************************************"
232 echo "**** --enable-rohc not yet implemented *******************************" 248 echo "**** --enable-rohc is highly experimental, do not use ****************"
233 echo "**********************************************************************"
234 echo "**** uuh sorry, I am such an ass, but I didn't find any rfc3095 (ROHC)"
235 echo "**** implementation to be used in GPL code on the web."
236 echo "**** so this option is just a fake. Please implement one and send it"
237 echo "**** to me ;)"
238 echo "**********************************************************************"
239 echo "**********************************************************************"
240 echo "**********************************************************************" 249 echo "**********************************************************************"
241 echo "**********************************************************************" 250 echo "**********************************************************************"
242 echo 251 echo
252 rohc=true
253 AC_DEFINE_UNQUOTED(ENABLE_ROHC, 1, [ROHC support])
243 ] 254 ]
244) 255)
245 256
257AM_CONDITIONAL(ROHC, test x$rohc = xtrue)
258
246AC_ARG_ENABLE(icmp, 259AC_ARG_ENABLE(icmp,
247 [AC_HELP_STRING(--enable-icmp, [enable icmp protocol support (default disabled).])], 260 [AS_HELP_STRING(--enable-icmp,enable icmp protocol support (default disabled).)],
248 AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.]) 261 AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.])
249) 262)
250 263
251AC_ARG_ENABLE(tcp, 264AC_ARG_ENABLE(tcp,
252 [AC_HELP_STRING(--enable-tcp, [enable tcp protocol support (default disabled).])], 265 [AS_HELP_STRING(--enable-tcp,enable tcp protocol support (default disabled).)],
253 AC_DEFINE_UNQUOTED(ENABLE_TCP, 1, [TCP protocol support.]) 266 AC_DEFINE_UNQUOTED(ENABLE_TCP, 1, [TCP protocol support.])
254) 267)
255 268
269AC_ARG_ENABLE(dns,
270 [AS_HELP_STRING(--enable-dns,enable dns tunnel protocol support (DOES NOT WORK).)],
271 [
272 AC_CHECK_HEADER(gmp.h,,[AC_MSG_ERROR([gmp.h not found, required for --enable-dns])])
273 AC_CHECK_LIB(gmp,main,,[AC_MSG_ERROR([libgmp not found, required for --enable-dns])])
274
275 AC_DEFINE_UNQUOTED(ENABLE_DNS, 1, [DNS tunnel protocol support.])
276 ]
277)
278
256AC_ARG_ENABLE(http-proxy, 279AC_ARG_ENABLE(http-proxy,
257 [AC_HELP_STRING(--enable-http-proxy, [enable http proxy connect support (default disabled).])], 280 [AS_HELP_STRING(--enable-http-proxy,enable http proxy connect support (default disabled).)],
258 AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.]) 281 AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.])
259) 282)
260 283
261HMAC=12 dnl see also the AC_HELP_STRING 284HMAC=12
262AC_ARG_ENABLE(hmac-length, 285AC_ARG_ENABLE(hmac-length,
263 [AC_HELP_STRING(--enable-hmac-length=BYTES, [use a hmac of length BYTES bytes (default 12). Allowed values are 4, 8, 12, 16.])], 286 [AS_HELP_STRING(--enable-hmac-length=BYTES,[
287 use a hmac of length BYTES bytes (default 12). Allowed values are 4, 8, 12, 16.])],
264 HMAC=$enableval 288 HMAC=$enableval
265) 289)
266AC_DEFINE_UNQUOTED(HMACLENGTH, $HMAC, [Size of HMAC in each packet in bytes.]) 290AC_DEFINE_UNQUOTED(HMACLENGTH, $HMAC, [Size of HMAC in each packet in bytes.])
267 291
268RAND=8 dnl see also the AC_HELP_STRING 292RAND=8
269AC_ARG_ENABLE(rand-length, 293AC_ARG_ENABLE(rand-length,
270 [AC_HELP_STRING(--enable-rand-length=BYTES, [use BYTES bytes of extra randomness (default 8). Allowed values are 0, 4, 8.])], 294 [AS_HELP_STRING(--enable-rand-length=BYTES,
295 [use BYTES bytes of extra randomness (default 8). Allowed values are 0, 4, 8.])],
271 RAND=$enableval 296 RAND=$enableval
272) 297)
273AC_DEFINE_UNQUOTED(RAND_SIZE, $RAND, [Add this many bytes of randomness to each packet.]) 298AC_DEFINE_UNQUOTED(RAND_SIZE, $RAND, [Add this many bytes of randomness to each packet.])
274 299
275MTU=1500 dnl see also the AC_HELP_STRING 300MTU=1500
276AC_ARG_ENABLE(mtu, 301AC_ARG_ENABLE(mtu,
277 [AC_HELP_STRING(--enable-max-mtu=BYTES, enable mtu sizes upto BYTES bytes (default 1500). Use 9100 for jumbogram support.)], 302 [AS_HELP_STRING(--enable-max-mtu=BYTES,enable mtu sizes upto BYTES bytes (default 1500). Use 9100 for jumbogram support.)],
278 MTU=$enableval 303 MTU=$enableval
279) 304)
280AC_DEFINE_UNQUOTED(MAX_MTU, $MTU + 14, [Maximum MTU supported.]) 305AC_DEFINE_UNQUOTED(MAX_MTU, $MTU + 14, [Maximum MTU supported.])
281 306
282COMPRESS=1 307COMPRESS=1
283AC_ARG_ENABLE(compression, 308AC_ARG_ENABLE(compression,
284 [AC_HELP_STRING(--disable-compression, Disable compression support.)], 309 [AS_HELP_STRING(--disable-compression,Disable compression support.)],
285 if test "x$enableval" = xno; then 310 if test "x$enableval" = xno; then
286 COMPRESS=0 311 COMPRESS=0
287 fi 312 fi
288) 313)
289AC_DEFINE_UNQUOTED(ENABLE_COMPRESSION, $COMPRESS, [Enable compression support.]) 314AC_DEFINE_UNQUOTED(ENABLE_COMPRESSION, $COMPRESS, [Enable compression support.])
290 315
291CIPHER=bf_cbc 316CIPHER=bf_cbc
292AC_ARG_ENABLE(cipher, 317AC_ARG_ENABLE(cipher,
293 [AC_HELP_STRING(--enable-cipher, [ 318 [AS_HELP_STRING(--enable-cipher,[
294 Select the symmetric cipher (default "bf"). Must be one of 319 Select the symmetric cipher (default "bf").
295 "bf" (blowfish), "aes-128" (rijndael), "aes-192" or "aes-256".])], 320 Must be one of "bf" (blowfish), "aes-128" (rijndael), "aes-192" or "aes-256".])],
296 if test "x$enableval" = xbf ; then CIPHER=bf_cbc ; fi 321 if test "x$enableval" = xbf ; then CIPHER=bf_cbc ; fi
297 if test "x$enableval" = xaes-128; then CIPHER=aes_128_cbc; fi 322 if test "x$enableval" = xaes-128; then CIPHER=aes_128_cbc; fi
298 if test "x$enableval" = xaes-192; then CIPHER=aes_192_cbc; fi 323 if test "x$enableval" = xaes-192; then CIPHER=aes_192_cbc; fi
299 if test "x$enableval" = xaes-256; then CIPHER=aes_256_cbc; fi 324 if test "x$enableval" = xaes-256; then CIPHER=aes_256_cbc; fi
300) 325)
301AC_DEFINE_UNQUOTED(ENABLE_CIPHER, EVP_${CIPHER}, [Select the symmetric cipher to use.]) 326AC_DEFINE_UNQUOTED(ENABLE_CIPHER, EVP_${CIPHER}, [Select the symmetric cipher to use.])
302 327
303DIGEST=sha1 328DIGEST=sha1
304AC_ARG_ENABLE(digest, 329AC_ARG_ENABLE(digest,
305 [AC_HELP_STRING(--enable-digest, [ 330 [AS_HELP_STRING(--enable-digest,[
306 Select the digets algorithm to use (default "sha1"). Must be one of 331 Select the digets algorithm to use (default "sha1"). Must be one of
307 "sha1", "ripemd160", "md5" or "md4" (insecure).])], 332 "sha1", "ripemd160", "md5" or "md4" (insecure).])],
308 if test "x$enableval" = xsha1 ; then DIGEST=sha1 ; fi 333 if test "x$enableval" = xsha1 ; then DIGEST=sha1 ; fi
309 if test "x$enableval" = xripemd160; then DIGEST=ripemd160; fi 334 if test "x$enableval" = xripemd160; then DIGEST=ripemd160; fi
310 if test "x$enableval" = xmd5 ; then DIGEST=md5 ; fi 335 if test "x$enableval" = xmd5 ; then DIGEST=md5 ; fi
311 if test "x$enableval" = xmd4 ; then DIGEST=md4 ; fi 336 if test "x$enableval" = xmd4 ; then DIGEST=md4 ; fi
312) 337)
… …
318 343
319if $CXX -v --help 2>&1 | grep -q fexceptions; then 344if $CXX -v --help 2>&1 | grep -q fexceptions; then
320 CXXFLAGS="$CXXFLAGS -fno-exceptions" 345 CXXFLAGS="$CXXFLAGS -fno-exceptions"
321fi 346fi
322 347
323if $CXX -v --help 2>&1 | grep -q ffunction-sections; then 348dnl if $CXX -v --help 2>&1 | grep -q ffunction-sections; then
324 CXXFLAGS="$CXXFLAGS -ffunction-sections" 349dnl CXXFLAGS="$CXXFLAGS -ffunction-sections"
325fi 350dnl fi
326 351dnl
327if $LD -v --help 2>&1 | grep -q gc-sections; then 352dnl if $LD -v --help 2>&1 | grep -q gc-sections; then
328 LDFLAGS="$LDFLAGS -Wl,--gc-sections" 353dnl LDFLAGS="$LDFLAGS -Wl,--gc-sections"
329fi 354dnl fi
330 355
331AC_CONFIG_COMMANDS_POST([ 356AC_CONFIG_COMMANDS_POST([
332 357
333echo 358echo
334echo "***" 359echo "***"
… …
339echo "*** Digest used: $DIGEST" 364echo "*** Digest used: $DIGEST"
340echo "*** HMAC length: $HMAC" 365echo "*** HMAC length: $HMAC"
341echo "*** RAND used: $RAND" 366echo "*** RAND used: $RAND"
342echo "*** Max. MTU: $MTU" 367echo "*** Max. MTU: $MTU"
343echo "*** Compression: $COMPRESS" 368echo "*** Compression: $COMPRESS"
344echo "***"
345 369
346if test "x$DIGEST" = xmd4; then 370if test "x$DIGEST" = xmd4; then
347echo "*** WARNING" 371echo "***"
348echo "*** The digest you have chosen ($DIGEST) is known to be insecure" 372echo "*** WARNING: The digest you have chosen ($DIGEST) is known to be insecure"
349echo "***"
350fi 373fi
374
375if test "$HMAC" -lt 12; then
376echo "***"
377echo "*** WARNING: The hmac length you have chosen ($HMAC) is probably insecure"
378fi
379
380if test "$RAND" -lt 8; then
381echo "***"
382echo "*** WARNING: The random prefix you have chosen ($RAND) is probably insecure"
383fi
384
385echo "***"
351 386
352echo 387echo
353 388
354]) 389])
355 390
356AC_SUBST(INCLUDES) 391AC_SUBST(INCLUDES)
357 392
358AC_OUTPUT(Makefile po/Makefile.in 393AC_CONFIG_FILES([Makefile po/Makefile.in
359src/Makefile 394src/Makefile
360doc/Makefile 395doc/Makefile
361lib/Makefile 396lib/Makefile
362m4/Makefile 397m4/Makefile
363) 398])
399AC_OUTPUT

Diff Legend

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