j3d1/tinc
1
0
Fork 0
Code Issues1 Pull requests Releases Wiki Activity

Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Browse source 
Conflicts:
	NEWS
	README
	configure.in
	src/Makefile.am
This commit is contained in:
Guus Sliepen 2011-06-24 21:40:55 +02:00
commit 79e9a4f743
3 changed files with 10 additions and 4 deletions

8
NEWS
View file

@ -4,7 +4,13 @@ Version 1.1-cvs Work in progress
* Use splay trees instead of AVL trees. * Use splay trees instead of AVL trees.
* Fix ProcessPriority option under Windows. Version 1.0.15 June 24 2011
* Improved logging to file.
* Reduced amount of process wakeups on platforms which support pselect().
* Fixed ProcessPriority option under Windows.
Version 1.0.14 May 8 2011 Version 1.0.14 May 8 2011

4
README.git
View file

@ -13,7 +13,7 @@ to install the very latest versions of the following packages:
Then you have to let the autotools create all the autogenerated files, using Then you have to let the autotools create all the autogenerated files, using
this command: this command:
autoreconf -f -s -i autoreconf -fsi
If you change configure.in or any Makefile.am file, you will have to rerun If you change configure.in or any Makefile.am file, you will have to rerun
autoreconf. After this, you can run configure and make as usual. To create a autoreconf. After this, you can run configure and make as usual. To create a
@ -23,4 +23,4 @@ make dist
To clean up your working copy so that no autogenerated files remain, run: To clean up your working copy so that no autogenerated files remain, run:
git clean git clean -f

2
src/Makefile.am
View file

@ -40,7 +40,7 @@ if TUNEMU
LIBS += -lpcap LIBS += -lpcap
endif endif
AM_CFLAGS = @CFLAGS@ -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\" AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
dist-hook: dist-hook:
rm -f `find . -type l` rm -f `find . -type l`