Merge branch 'master' of git@github:tstack/lnav

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

LICENSE

@@ -0,0 +1,24 @@
+Copyright (c) 2010, Timothy Stack
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are 
+met:
+
+  * Redistributions of source code must retain the above copyright 
+    notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright 
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Makefile.am

@@ -4,3 +4,6 @@ ACLOCAL_AMFLAGS = -I .
 SUBDIRS = src test
 
 noinst_SCRIPTS = TESTS_ENVIRONMENT
+
+EXTRA_DIST = \
+	LICENSE

Makefile.in

@@ -188,6 +188,9 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I .
 SUBDIRS = src test
 noinst_SCRIPTS = TESTS_ENVIRONMENT
+EXTRA_DIST = \
+	LICENSE
+
 all: all-recursive
 
 .SUFFIXES:

src/Makefile.am

@@ -25,7 +25,8 @@ endif
 AM_LDFLAGS = \
 	$(SQLITE3_LDFLAGS) \
 	$(PCRE_LDFLAGS) \
-	-pthread
+	-pthread \
+	-static
 
 AM_CPPFLAGS = \
 	-Wall \

src/Makefile.in

@@ -207,7 +207,8 @@ noinst_LIBRARIES = libdiag.a
 AM_LDFLAGS = \
 	$(SQLITE3_LDFLAGS) \
 	$(PCRE_LDFLAGS) \
-	-pthread
+	-pthread \
+	-static
 
 AM_CPPFLAGS = \
 	-Wall \