tinc/m4
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
..
attribute.m4 Remove autogen.sh, the autoreconf program does exactly that. 2004-01-10 23:21:36 +00:00
curses.m4 Add a very primitive "top" command to tincctl. 2011-05-15 13:16:48 +02:00
libevent.m4 Better integration of libevent in build system. 2009-11-07 14:35:48 +01:00
lzo.m4 Add --disable-lzo configure option 2010-02-10 16:47:52 +01:00
Makefile.am Remove autogen.sh, the autoreconf program does exactly that. 2004-01-10 23:21:36 +00:00
openssl.m4 Reorder checks for libraries to allow ./configure LDFLAGS=-static. 2011-05-13 12:37:26 +02:00
README Initial revision 2000-03-26 00:33:07 +00:00
zlib.m4 Add --disable-zlib configure option 2010-02-10 16:47:52 +01:00

These files are used by a program called aclocal (part of the GNU automake
package).  aclocal uses these files to create aclocal.m4 which is in turn
used by autoconf to create the configure script at the the top level in
this distribution.

The Makefile.am file in this directory is automatically generated
from the template file, Makefile.am.in.  The generation will fail
if you don't have all the right tools.