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

Comparing gvpe/configure.ac (file contents):
Revision 1.11 by pcg, Tue Oct 14 19:45:35 2003 UTC vs.
Revision 1.36 by pcg, Thu Mar 17 23:59:37 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.8)
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"
87 "tincd/raw_socket"
88 "tincd/uml_socket";
74 Broken combinations are: 89 Broken combinations are:
75 "native/cygwin"; 90 "tincd/cygwin";
76 The default is to autodetect. 91 The default is to autodetect.
77 ])], 92 )],
78 [ 93 [
79 IFTYPE=`echo $enableval | sed s%/.*%%` 94 IFTYPE=`echo $enableval | sed s%/.*%%`
80 IFSUBTYPE=`echo $enableval | sed s%.*/%%` 95 IFSUBTYPE=`echo $enableval | sed s%.*/%%`
81 ] 96 ]
82) 97)
… …
115 IFTYPE=tincd 130 IFTYPE=tincd
116 IFSUBTYPE=netbsd 131 IFSUBTYPE=netbsd
117 AC_DEFINE(HAVE_NETBSD, 1, [NetBSD]) 132 AC_DEFINE(HAVE_NETBSD, 1, [NetBSD])
118 ;; 133 ;;
119 *cygwin*) 134 *cygwin*)
120 IFTYPE=tincd 135 IFTYPE=native
121 IFSUBTYPE=cygwin 136 IFSUBTYPE=cygwin
122 AC_DEFINE(HAVE_CYGWIN, 1, [Cygwin]) 137 AC_DEFINE(HAVE_CYGWIN, 1, [Cygwin])
123 ;; 138 ;;
124 *) 139 *)
125 AC_MSG_ERROR("Unknown operating system.") 140 AC_MSG_ERROR("Unknown operating system.")
… …
127 esac 142 esac
128fi 143fi
129AC_MSG_RESULT($IFTYPE/$IFSUBTYPE) 144AC_MSG_RESULT($IFTYPE/$IFSUBTYPE)
130AC_SUBST(IFTYPE,$IFTYPE) 145AC_SUBST(IFTYPE,$IFTYPE)
131AC_SUBST(IFSUBTYPE,$IFSUBTYPE) 146AC_SUBST(IFSUBTYPE,$IFSUBTYPE)
147AC_DEFINE_UNQUOTED(IFTYPE,"$IFTYPE",[kernel interface type])
148AC_DEFINE_UNQUOTED(IFSUBTYPE,"$IFSUBTYPE",[kernel interface subtype])
132 149
133AC_CACHE_SAVE 150AC_CACHE_SAVE
134 151
135dnl Checks for libraries. 152dnl Checks for libraries.
136 153
137AC_LANG(C++) 154AC_LANG(C++)
138AC_CHECK_HEADERS(ext/hash_map) 155AC_CHECK_HEADERS(ext/hash_map)
139 156
140dnl Checks for header files. 157dnl Checks for header files.
141AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \ 158AC_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 \ 159 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]) 160 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], [], [], 161AC_CHECK_HEADERS([arpa/inet.h net/ethernet.h net/if.h netinet/ip.h netinet/tcp.h netinet/in_systm.h], [], [],
145[ 162[
146#include <sys/types.h> 163#include <sys/types.h>
147#include <sys/socket.h> 164#include <sys/socket.h>
148#ifdef HAVE_NETINET_IN_H 165#ifdef HAVE_NETINET_IN_H
149# include <netinet/in.h> 166# include <netinet/in.h>
… …
163AC_HEADER_TIME 180AC_HEADER_TIME
164AC_STRUCT_TM 181AC_STRUCT_TM
165 182
166AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t, 183AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
167[ 184[
168 AC_TRY_COMPILE( 185 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
169 [#include <sys/types.h> 186 #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]) 187])
175if test $ac_cv_type_socklen_t = yes; then 188if test $ac_cv_type_socklen_t = yes; then
176 AC_DEFINE(HAVE_SOCKLEN_T, 1, [socklen_t available]) 189 AC_DEFINE(HAVE_SOCKLEN_T, 1, [socklen_t available])
177fi 190fi
178 191
179AC_CACHE_CHECK([for struct addrinfo], ac_cv_struct_addrinfo, 192AC_CACHE_CHECK([for struct addrinfo], ac_cv_struct_addrinfo,
180[ 193[
181 AC_TRY_COMPILE( 194 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
182 [#include <sys/types.h>
183 #include <sys/socket.h> 195 #include <sys/socket.h>
184 #include <netdb.h>], 196 #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]) 197])
189if test $ac_cv_struct_addrinfo = yes; then 198if test $ac_cv_struct_addrinfo = yes; then
190 AC_DEFINE(HAVE_STRUCT_ADDRINFO, 1, [struct addrinfo available]) 199 AC_DEFINE(HAVE_STRUCT_ADDRINFO, 1, [struct addrinfo available])
191fi 200fi
192 201
… …
196AC_LANG_PUSH(C) 205AC_LANG_PUSH(C)
197 206
198AC_HEADER_STDC 207AC_HEADER_STDC
199 208
200dnl argl, could somebody catapult darwin into the 21st century??? 209dnl 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) 210AC_CHECK_FUNCS(asprintf daemon get_current_dir_name putenv select strerror strsignal strtol unsetenv mlockall)
202 211
203AC_FUNC_ALLOCA 212AC_FUNC_ALLOCA
204 213
205dnl Support for SunOS 214dnl Support for SunOS
206 215
… …
217 226
218AC_CACHE_SAVE 227AC_CACHE_SAVE
219 228
220dnl These are defined in files in m4/ 229dnl These are defined in files in m4/
221tinc_TUNTAP 230tinc_TUNTAP
231
222tinc_OPENSSL 232tinc_OPENSSL
233if test "x$openssl_include" != x; then
234 CXXFLAGS="$CXXFLAGS -I$openssl_include"
235fi
223dnl tinc_ZLIB 236dnl tinc_ZLIB
224 237
238AC_ARG_ENABLE(static-daemon,
239 [AS_HELP_STRING(--enable-static-daemon,enable statically linked daemon.)],
240 [LDFLAGS_DAEMON=-static]
241)
242AC_SUBST(LDFLAGS_DAEMON)
243
225AC_ARG_ENABLE(rohc, 244AC_ARG_ENABLE(rohc,
226 [AC_HELP_STRING(--enable-rohc, [enable robust header compression (rfc3095).])], 245 [AS_HELP_STRING(--enable-rohc,enable robust header compression (rfc3095).)],
227 [ 246 [
228 echo 247 echo
229 echo "**********************************************************************" 248 echo "**********************************************************************"
230 echo "**********************************************************************" 249 echo "**********************************************************************"
231 echo "**** --enable-rohc not yet implemented *******************************" 250 echo "**** --enable-rohc is highly experimental, do not use ****************"
232 echo "**********************************************************************"
233 echo "**** uuh sorry, I am such an ass, but I didn't find any rfc3095 (ROHC)"
234 echo "**** implementation to be used in GPL code on the web."
235 echo "**** so this option is just a fake. Please implement one and send it"
236 echo "**** to me ;)"
237 echo "**********************************************************************"
238 echo "**********************************************************************"
239 echo "**********************************************************************" 251 echo "**********************************************************************"
240 echo "**********************************************************************" 252 echo "**********************************************************************"
241 echo 253 echo
254 rohc=true
255 AC_DEFINE_UNQUOTED(ENABLE_ROHC, 1, [ROHC support])
242 ] 256 ]
243) 257)
244 258
259AM_CONDITIONAL(ROHC, test x$rohc = xtrue)
260
245AC_ARG_ENABLE(icmp, 261AC_ARG_ENABLE(icmp,
246 [AC_HELP_STRING(--enable-icmp, [enable icmp protocol support (default disabled).])], 262 [AS_HELP_STRING(--enable-icmp,enable icmp protocol support (default disabled).)],
247 AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.]) 263 AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.])
248) 264)
249 265
250AC_ARG_ENABLE(tcp, 266AC_ARG_ENABLE(tcp,
251 [AC_HELP_STRING(--enable-tcp, [enable tcp protocol support (default disabled).])], 267 [AS_HELP_STRING(--enable-tcp,enable tcp protocol support (default disabled).)],
252 AC_DEFINE_UNQUOTED(ENABLE_TCP, 1, [TCP protocol support.]) 268 AC_DEFINE_UNQUOTED(ENABLE_TCP, 1, [TCP protocol support.])
253) 269)
254 270
271AC_ARG_ENABLE(dns,
272 [AS_HELP_STRING(--enable-dns,enable dns tunnel protocol support (DOES NOT WORK).)],
273 [
274 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])])
276
277 AC_DEFINE_UNQUOTED(ENABLE_DNS, 1, [DNS tunnel protocol support.])
278 ]
279)
280
255AC_ARG_ENABLE(http-proxy, 281AC_ARG_ENABLE(http-proxy,
256 [AC_HELP_STRING(--enable-http-proxy, [enable http proxy connect support (default disabled).])], 282 [AS_HELP_STRING(--enable-http-proxy,enable http proxy connect support (default disabled).)],
257 AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.]) 283 AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.])
258) 284)
259 285
260HMAC=12 dnl see also the AC_HELP_STRING 286HMAC=12
261AC_ARG_ENABLE(hmac-length, 287AC_ARG_ENABLE(hmac-length,
262 [AC_HELP_STRING(--enable-hmac-length=BYTES, [use a hmac of length BYTES bytes (default 12). Allowed values are 4, 8, 12, 16.])], 288 [AS_HELP_STRING(--enable-hmac-length=BYTES,[
289 use a hmac of length BYTES bytes (default 12). Allowed values are 4, 8, 12, 16.])],
263 HMAC=$enableval 290 HMAC=$enableval
264) 291)
265AC_DEFINE_UNQUOTED(HMACLENGTH, $HMAC, [Size of HMAC in each packet in bytes.]) 292AC_DEFINE_UNQUOTED(HMACLENGTH, $HMAC, [Size of HMAC in each packet in bytes.])
266 293
267RAND=8 dnl see also the AC_HELP_STRING 294RAND=8
268AC_ARG_ENABLE(rand-length, 295AC_ARG_ENABLE(rand-length,
269 [AC_HELP_STRING(--enable-rand-length=BYTES, [use BYTES bytes of extra randomness (default 8). Allowed values are 0, 4, 8.])], 296 [AS_HELP_STRING(--enable-rand-length=BYTES,
297 [use BYTES bytes of extra randomness (default 8). Allowed values are 0, 4, 8.])],
270 RAND=$enableval 298 RAND=$enableval
271) 299)
272AC_DEFINE_UNQUOTED(RAND_SIZE, $RAND, [Add this many bytes of randomness to each packet.]) 300AC_DEFINE_UNQUOTED(RAND_SIZE, $RAND, [Add this many bytes of randomness to each packet.])
273 301
274MTU=1500 dnl see also the AC_HELP_STRING 302MTU=1500
275AC_ARG_ENABLE(mtu, 303AC_ARG_ENABLE(mtu,
276 [AC_HELP_STRING(--enable-max-mtu=BYTES, enable mtu sizes upto BYTES bytes (default 1500). Use 9100 for jumbogram support.)], 304 [AS_HELP_STRING(--enable-max-mtu=BYTES,enable mtu sizes upto BYTES bytes (default 1500). Use 9100 for jumbogram support.)],
277 MTU=$enableval 305 MTU=$enableval
278) 306)
279AC_DEFINE_UNQUOTED(MAX_MTU, $MTU + 14, [Maximum MTU supported.]) 307AC_DEFINE_UNQUOTED(MAX_MTU, $MTU + 14, [Maximum MTU supported.])
280 308
281COMPRESS=1 309COMPRESS=1
282AC_ARG_ENABLE(compression, 310AC_ARG_ENABLE(compression,
283 [AC_HELP_STRING(--disable-compression, Disable compression support.)], 311 [AS_HELP_STRING(--disable-compression,Disable compression support.)],
284 if test "x$enableval" = xno; then 312 if test "x$enableval" = xno; then
285 COMPRESS=0 313 COMPRESS=0
286 fi 314 fi
287) 315)
288AC_DEFINE_UNQUOTED(ENABLE_COMPRESSION, $COMPRESS, [Enable compression support.]) 316AC_DEFINE_UNQUOTED(ENABLE_COMPRESSION, $COMPRESS, [Enable compression support.])
289 317
290CIPHER=bf_cbc 318CIPHER=bf_cbc
291AC_ARG_ENABLE(cipher, 319AC_ARG_ENABLE(cipher,
292 [AC_HELP_STRING(--enable-cipher, [ 320 [AS_HELP_STRING(--enable-cipher,[
293 Select the symmetric cipher (default "bf"). Must be one of 321 Select the symmetric cipher (default "bf").
294 "bf" (blowfish), "aes-128" (rijndael), "aes-192" or "aes-256".])], 322 Must be one of "bf" (blowfish), "aes-128" (rijndael), "aes-192" or "aes-256".])],
295 if test "x$enableval" = xbf ; then CIPHER=bf_cbc ; fi 323 if test "x$enableval" = xbf ; then CIPHER=bf_cbc ; fi
296 if test "x$enableval" = xaes-128; then CIPHER=aes_128_cbc; fi 324 if test "x$enableval" = xaes-128; then CIPHER=aes_128_cbc; fi
297 if test "x$enableval" = xaes-192; then CIPHER=aes_192_cbc; fi 325 if test "x$enableval" = xaes-192; then CIPHER=aes_192_cbc; fi
298 if test "x$enableval" = xaes-256; then CIPHER=aes_256_cbc; fi 326 if test "x$enableval" = xaes-256; then CIPHER=aes_256_cbc; fi
299) 327)
300AC_DEFINE_UNQUOTED(ENABLE_CIPHER, EVP_${CIPHER}, [Select the symmetric cipher to use.]) 328AC_DEFINE_UNQUOTED(ENABLE_CIPHER, EVP_${CIPHER}, [Select the symmetric cipher to use.])
301 329
302DIGEST=sha1 330DIGEST=sha1
303AC_ARG_ENABLE(digest, 331AC_ARG_ENABLE(digest,
304 [AC_HELP_STRING(--enable-digest, [ 332 [AS_HELP_STRING(--enable-digest,[
305 Select the digets algorithm to use (default "sha1"). Must be one of 333 Select the digets algorithm to use (default "sha1"). Must be one of
306 "sha1", "ripemd160", "md5" or "md4" (insecure).])], 334 "sha1", "ripemd160", "md5" or "md4" (insecure).])],
307 if test "x$enableval" = xsha1 ; then DIGEST=sha1 ; fi 335 if test "x$enableval" = xsha1 ; then DIGEST=sha1 ; fi
308 if test "x$enableval" = xripemd160; then DIGEST=ripemd160; fi 336 if test "x$enableval" = xripemd160; then DIGEST=ripemd160; fi
309 if test "x$enableval" = xmd5 ; then DIGEST=md5 ; fi 337 if test "x$enableval" = xmd5 ; then DIGEST=md5 ; fi
310 if test "x$enableval" = xmd4 ; then DIGEST=md4 ; fi 338 if test "x$enableval" = xmd4 ; then DIGEST=md4 ; fi
311) 339)
… …
317 345
318if $CXX -v --help 2>&1 | grep -q fexceptions; then 346if $CXX -v --help 2>&1 | grep -q fexceptions; then
319 CXXFLAGS="$CXXFLAGS -fno-exceptions" 347 CXXFLAGS="$CXXFLAGS -fno-exceptions"
320fi 348fi
321 349
322if $CXX -v --help 2>&1 | grep -q ffunction-sections; then 350dnl if $CXX -v --help 2>&1 | grep -q ffunction-sections; then
323 CXXFLAGS="$CXXFLAGS -ffunction-sections" 351dnl CXXFLAGS="$CXXFLAGS -ffunction-sections"
324fi 352dnl fi
325 353dnl
326if $LD -v --help 2>&1 | grep -q gc-sections; then 354dnl if $LD -v --help 2>&1 | grep -q gc-sections; then
327 LDFLAGS="$LDFLAGS -Wl,--gc-sections" 355dnl LDFLAGS="$LDFLAGS -Wl,--gc-sections"
328fi 356dnl fi
329 357
330AC_CONFIG_COMMANDS_POST([ 358AC_CONFIG_COMMANDS_POST([
331 359
332echo 360echo
333echo "***" 361echo "***"
… …
338echo "*** Digest used: $DIGEST" 366echo "*** Digest used: $DIGEST"
339echo "*** HMAC length: $HMAC" 367echo "*** HMAC length: $HMAC"
340echo "*** RAND used: $RAND" 368echo "*** RAND used: $RAND"
341echo "*** Max. MTU: $MTU" 369echo "*** Max. MTU: $MTU"
342echo "*** Compression: $COMPRESS" 370echo "*** Compression: $COMPRESS"
343echo "***"
344 371
345if test "x$DIGEST" = xmd4; then 372if test "x$DIGEST" = xmd4; then
346echo "*** WARNING" 373echo "***"
347echo "*** The digest you have chosen ($DIGEST) is known to be insecure" 374echo "*** WARNING: The digest you have chosen ($DIGEST) is known to be insecure"
348echo "***"
349fi 375fi
376
377if test "$HMAC" -lt 12; then
378echo "***"
379echo "*** WARNING: The hmac length you have chosen ($HMAC) is probably insecure"
380fi
381
382if test "$RAND" -lt 8; then
383echo "***"
384echo "*** WARNING: The random prefix you have chosen ($RAND) is probably insecure"
385fi
386
387echo "***"
350 388
351echo 389echo
352 390
353]) 391])
354 392
355AC_SUBST(INCLUDES) 393AC_SUBST(INCLUDES)
356 394
357AC_OUTPUT(Makefile po/Makefile.in 395AC_CONFIG_FILES([Makefile po/Makefile.in
358src/Makefile 396src/Makefile
359doc/Makefile 397doc/Makefile
360lib/Makefile 398lib/Makefile
361m4/Makefile 399m4/Makefile
362) 400])
401AC_OUTPUT

Diff Legend

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