Commit graph

61 commits

Author SHA1 Message Date
Guus Sliepen
7944cce19e Don't use AM_CONDITIONAL for CURSES.
For some reason, this doesn't work when cross-compiling for Windows.
2011-06-25 00:06:06 +02:00
Guus Sliepen
33f241d978 Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
Conflicts:
	NEWS
	configure.in
	doc/tincd.8.in
	lib/pidfile.c
	lib/pidfile.h
	lib/xalloc.h
	lib/xmalloc.c
	src/conf.c
	src/conf.h
	src/connection.c
	src/connection.h
	src/event.c
	src/graph.c
	src/graph.h
	src/net.c
	src/net.h
	src/node.h
	src/openssl/crypto.c
	src/process.c
	src/protocol.c
	src/protocol_key.c
	src/route.c
2011-06-06 20:42:15 +02:00
Guus Sliepen
97355690b9 Add a very primitive "top" command to tincctl. 2011-05-15 13:16:48 +02:00
Guus Sliepen
ec495b2f15 Add an autoconf check for the curses library. 2011-05-15 12:06:21 +02:00
Guus Sliepen
03b7118139 Reorder checks for libraries to allow ./configure LDFLAGS=-static.
OpenSSL depends on libdl and libz. When linking dynamically, libcrypto will
automatically link with the other two libraries.  However, when linking
statically, these libraries need to be specified explicitly while linking.  By
moving the autoconf checks for libdl and libz before those for libcrypto, we
ensure the latter test will be done with the proper libraries.
2011-05-13 12:37:26 +02:00
Guus Sliepen
ce8775000a Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
Conflicts:
	NEWS
	README
	configure.in
	doc/tincd.8.in
	lib/pidfile.c
	src/bsd/device.c
	src/dropin.h
	src/net.c
	src/net_packet.c
	src/node.c
	src/process.c
	src/tincd.c
2011-05-09 21:35:14 +02:00
Guus Sliepen
dc887f5011 Ensure proper linking with OpenSSL with recent versions of MinGW. 2011-05-08 23:12:06 +02:00
Guus Sliepen
6e6b037ef4 Check for EVP_EncryptInit_ex instead of SHA1_Version in OpenSSL.
The latter function disappeared, and wasn't actually used in tinc, so now we
check on a function that we do use.
2011-05-08 21:06:06 +02:00
Guus Sliepen
a22041922f Merge branch 'master' into 1.1
Conflicts:
	doc/tincd.8.in
	lib/pidfile.c
	src/graph.c
	src/net.c
	src/net.h
	src/net_packet.c
	src/net_setup.c
	src/net_socket.c
	src/netutl.c
	src/node.c
	src/node.h
	src/protocol_auth.c
	src/protocol_key.c
	src/tincd.c
2010-11-12 16:15:29 +01:00
Guus Sliepen
ef92a5725c OpenSSL 1.0.0 compiled for 64 bit Windows requires linking with -lcrypt32. 2010-05-01 15:39:03 +02:00
Sven-Haegar Koch
103543aa2c Merge branch 'master' into 1.1
Conflicts:
	NEWS
	README
	configure.in
	have.h
	src/conf.c
	src/conf.h
	src/net.c
	src/net_packet.c
	src/protocol_key.c
	src/protocol_subnet.c
	src/route.c
	src/tincd.c
2010-03-26 16:51:03 +01:00
Timothy Redaelli
ddb8cb0779 Add --disable-zlib configure option 2010-02-10 16:47:52 +01:00
Timothy Redaelli
eeb505af36 Add --disable-lzo configure option 2010-02-10 16:47:52 +01:00
Guus Sliepen
5c5548fc71 Better integration of libevent in build system.
Since event.h is not part of tinc, we include it in have.h were all other
system header files are included.  We also ensure -levent comes before -lgdi32
when compiling with MinGW, apparently it doesn't work when the order is
reversed.
2009-11-07 14:35:48 +01:00
Guus Sliepen
f1fec466e2 Add a better autoconf check for libevent. 2009-09-16 23:43:19 +02:00
Guus Sliepen
0322c0883b Remove the test for linux/if_tun.h.
It has been available for years on any decent Linux distribution.
Although linux/if_tun.h is now required to compile tinc,
you can still run it on systems which only support Ethertap.
2006-12-16 16:40:09 +00:00
Guus Sliepen
5219ee25a2 Use standard autoconf macros instead of our own. 2006-12-16 16:26:57 +00:00
Guus Sliepen
031e09f865 Remove unnecessary stuff from configure.in. 2006-12-15 20:43:39 +00:00
Guus Sliepen
47d916ec5e Search for lzo/lzo1x.h, lzo2/lzo1x.h and lzo1x.h. 2006-11-29 17:18:39 +00:00
Guus Sliepen
bdb3c24cea Support and autodetect LZO version 2.0 and later. 2006-11-11 20:06:14 +00:00
Guus Sliepen
0912260755 Enable OpenSSL ENGINE, so crypto hardware gets used. Thanks to Andreas van Cranenburgh. 2005-11-16 10:45:11 +00:00
Guus Sliepen
4350704d65 Remove CVS related cruft. 2004-03-15 17:54:19 +00:00
Guus Sliepen
fcd836c609 Remove autogen.sh, the autoreconf program does exactly that.
Update everything for the latest autoconf and automake versions.
2004-01-10 23:21:36 +00:00
Guus Sliepen
e898b930dc Use CPPFLAGS, LDFLAGS and LIBS as appropiate. 2003-10-06 16:05:30 +00:00
Guus Sliepen
da3078c63a Check if the compiler knows about the __malloc__ attribute. 2003-07-31 11:17:39 +00:00
Guus Sliepen
4370b98bb1 Update configure scripts. 2003-07-29 11:50:39 +00:00
Guus Sliepen
81f5713ab7 - simplify configure.in
- drop support for OpenSSL < 0.9.7
- add some missing definitions/includes
2003-07-06 17:15:25 +00:00
Guus Sliepen
4b0e5a03fe Fix warning and add missing checks for LZO library. 2003-06-07 13:18:32 +00:00
Guus Sliepen
1783a3aaa9 Various fixes for autoconf and OpenSSL 0.9.7 and a missing header. 2003-01-17 00:43:58 +00:00
Guus Sliepen
912e7e968f Gettext 1.11.5 compatibility. 2002-08-24 12:11:40 +00:00
Guus Sliepen
8988b127e1 Autoconf cleanup. Works for both 2.13 and 2.53, although running autoconf
2.53 still gives some errors.
2002-06-11 11:03:17 +00:00
Guus Sliepen
3d8a373bb3 Make configure --help output look nicer. 2002-03-27 19:43:50 +00:00
Guus Sliepen
d9a62c6354 Added support for packet compression, thanks to Mark Glines.
Add "Compression = <level>" to the host config files, where level can be
0 (off), or any integer between 1 (fast) and 9 (best).
2002-02-11 15:59:18 +00:00
Guus Sliepen
f0aa9641e8 Merging of the entire pre5 branch. 2002-02-10 21:57:54 +00:00
Guus Sliepen
b3074590b1 Correct inclusion of standard if_tun.h header file. 2001-07-15 14:21:12 +00:00
Guus Sliepen
1e2bdc2b6d - Always use <openssl/include.h> instead of just <include.h>
- Check if RAND_pseudo_bytes() exists, otherwise just use RAND_bytes()
2001-07-04 08:41:36 +00:00
Guus Sliepen
9391efe4e8 Check for dlopen in standard libraries first (needed for DEC OSF). 2001-06-29 14:15:46 +00:00
Ivo Timmermans
3503ba9950 Small fix to make it compile again 2001-06-26 22:00:57 +00:00
Guus Sliepen
7fc068fe54 Reinstated search for if_tun.h in kernel source tree, because apparently
/usr/include/linux does not always have the same contents as the include
files from the currently running kernel.
2001-06-21 18:28:52 +00:00
Guus Sliepen
b1e97ece9c Check for and add -ldl. 2001-06-21 16:37:05 +00:00
Guus Sliepen
c5c02a0861 Changed drastically because it didn't work correctly:
- Don't cache the --with-openssl-* option arguments
- Only search for openssl/*.h, the openssl include files include other
  files only from an openssl/ directory too
- Set CPPFLAGS before AC_CHECK_HEADERS
2001-06-07 07:51:04 +00:00
Ivo Timmermans
11f8465dd9 tinc_TUNTAP now substitutes the values outside the AC_CACHE_CHECK
block.  configure should now correctly set HAVE_TUNTAP.
2001-02-18 02:13:26 +00:00
Guus Sliepen
ef0fc4f687 Added .cvsignore files to get rid of warnings and prevent autogenerated
files from being added accidentaly.
2001-02-11 11:44:32 +00:00
Guus Sliepen
e1707f7739 - Don't even think about using sscanf with %as anymore
- Allow keys to be inside the config files or in a seperate file
- Small fixes
2000-12-22 21:34:24 +00:00
Ivo Timmermans
9175d20483 Added a check for a scanf that knows about %as. 2000-11-29 01:37:50 +00:00
Ivo Timmermans
3ff76eb10a Save RSA public and private keys to a separate file, instead of
wanting to copy them into a configuration file.
2000-11-28 23:12:57 +00:00
Ivo Timmermans
ef88db6312 Alter CFLAGS, somehow INCLUDES doesn't propagate properly. Still
doesn't work exactly like it should, but getting there.
2000-11-24 14:12:31 +00:00
Ivo Timmermans
6fb4a5b6be Also check for sha.h. 2000-11-15 01:02:30 +00:00
Ivo Timmermans
8eb60d0ccd Also check for rand.h and err.h. If any of these files does not
exist, try the next alternative path.
2000-11-15 00:57:26 +00:00
Ivo Timmermans
c5c8e99afd Get rid of the annoying empty line 2000-11-14 23:18:19 +00:00