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

Conflicts:
	NEWS
	README
	configure.in
	src/Makefile.am

diff --git a/NEWS b/NEWS
index 1a12155..44366cd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,13 @@ Version 1.1-cvs              Work in progress
 
  * 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
 

diff --git a/README.git b/README.git
index 4f895c5..77595d6 100644 (file)
--- a/README.git
+++ b/README.git
@@ -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
 this command:
 
-autoreconf -f -s -i
+autoreconf -fsi
 
 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
@@ -23,4 +23,4 @@ make dist
 
 To clean up your working copy so that no autogenerated files remain, run:
 
-git clean
+git clean -f

diff --git a/src/Makefile.am b/src/Makefile.am
index d9bf293..60709fb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,7 +40,7 @@ if TUNEMU
 LIBS += -lpcap
 endif
 
-AM_CFLAGS = @CFLAGS@ -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
+AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
 
 dist-hook:
        rm -f `find . -type l`