Merge branch 'master' of git://github.com/mxcl/homebrew

1 files changed, 26 insertions, 9 deletions

diff --git a/Library/Formula/sqlite.rb b/Library/Formula/sqlite.rb
index 085c13319..9063e062d 100644
--- a/Library/Formula/sqlite.rb
+++ b/Library/Formula/sqlite.rb
@@ -6,18 +6,27 @@ class SqliteFunctions < Formula
   version '2010-01-06'
 end
 
+class SqliteDocs < Formula
+  url 'http://www.sqlite.org/sqlite-doc-3070900.zip'
+  sha1 '2d4a25f75cc6b7251f1b49b828f9fd1d699fc8a2'
+  version '3.7.9'
+end
+
 class Sqlite < Formula
   homepage 'http://sqlite.org/'
-  url 'http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz'
-  md5 '554026fe7fac47b1cf61c18d5fe43419'
-  version '3.7.7.1'
+  url 'http://www.sqlite.org/sqlite-autoconf-3070900.tar.gz'
+  sha1 'a9da98a4bde4d9dae5c29a969455d11a03600e11'
+  version '3.7.9'
+
+  depends_on 'readline' => :optional
 
   def options
   [
-    ["--with-rtree", "Enables the R*Tree index module"],
-    ["--with-fts", "Enables the FTS Module"],
-    ["--universal", "Build a universal binary."],
-    ["--with-functions", "Enables more math and string functions for SQL queries."]
+    ["--with-docs", "Install HTML documentation"],
+    ["--with-rtree", "Enable the R*Tree index module"],
+    ["--with-fts", "Enable the FTS Module"],
+    ["--universal", "Build a universal binary"],
+    ["--with-functions", "Enable more math and string functions for SQL queries"]
   ]
   end
 
@@ -25,8 +34,14 @@ class Sqlite < Formula
     # O2 and O3 leads to corrupt/invalid rtree indexes
     # http://groups.google.com/group/spatialite-users/browse_thread/thread/8e1cfa79f2d02a00#
     ENV.Os
-    ENV.append "CFLAGS", "-DSQLITE_ENABLE_RTREE=1" if ARGV.include? "--with-rtree"
-    ENV.append "CPPFLAGS","-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS" if ARGV.include? "--with-fts"
+
+    ENV.append 'CPPFLAGS', "-DSQLITE_ENABLE_RTREE" if ARGV.include? "--with-rtree"
+    ENV.append 'CPPFLAGS', "-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS" if ARGV.include? "--with-fts"
+
+    # enable these options by default
+    ENV.append 'CPPFLAGS', "-DSQLITE_ENABLE_COLUMN_METADATA"
+    ENV.append 'CPPFLAGS', "-DSQLITE_ENABLE_STAT3"
+
     ENV.universal_binary if ARGV.build_universal?
 
     system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking",
@@ -39,6 +54,8 @@ class Sqlite < Formula
       system ENV.cc, "-fno-common", "-dynamiclib", "extension-functions.c", "-o", "libsqlitefunctions.dylib", *ENV.cflags.split
       lib.install "libsqlitefunctions.dylib"
     end
+
+    SqliteDocs.new.brew { doc.install Dir['*'] } if ARGV.include? "--with-docs"
   end
 
   if ARGV.include? "--with-functions"