From: Guus Sliepen <guus@tinc-vpn.org>
Date: Fri, 24 Jun 2011 19:40:55 +0000 (+0200)
Subject: Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
X-Git-Tag: release-1.1pre1~7
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=79e9a4f743b7b59fed968575f6b36171cf4a0063;hp=fb5b260190b1c6d07ec822154094aee7416f292e

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 1a121551..44366cda 100644
--- 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 4f895c5f..77595d6c 100644
--- 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 d9bf293f..60709fb7 100644
--- 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`