From ed998308fe4a2d7f5df440b59a11c5b363fc400c Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <brad@danga.com>
Date: Mon, 26 Aug 2013 17:52:02 -0500
Subject: [PATCH] make.go: turn --sqlite flag into a tri-state with 'auto' as
 default

Change-Id: I916e90aec6a19ff3d8610eccf8df84f445a46730
---
 make.go | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/make.go b/make.go
index 0950af302..e55193313 100644
--- a/make.go
+++ b/make.go
@@ -39,6 +39,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"runtime"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -47,7 +48,7 @@ var haveSQLite = checkHaveSQLite()
 
 var (
 	embedResources = flag.Bool("embed_static", true, "Whether to embed the closure library.")
-	sql            = flag.Bool("sqlite", haveSQLite, "Whether you want SQLite in your build.")
+	sqlFlag        = flag.String("sqlite", "auto", "Whether you want SQLite in your build: yes, no, or auto.")
 	all            = flag.Bool("all", false, "Force rebuild of everything (go install -a)")
 	verbose        = flag.Bool("v", false, "Verbose mode")
 	targets        = flag.String("targets", "", "Optional comma-separated list of targets (i.e go packages) to build and install. Empty means all. Example: camlistore.org/server/camlistored,camlistore.org/cmd/camput")
@@ -76,12 +77,21 @@ func main() {
 	}
 	verifyCamlistoreRoot(camRoot)
 
-	if runtime.GOOS != *buildOS || runtime.GOARCH != *buildARCH {
-		if *sql {
-			log.Fatalf("SQLite isn't available when cross-compiling to another OS. Set --sqlite=false.")
+	cross := runtime.GOOS != *buildOS || runtime.GOARCH != *buildARCH
+	var sql bool
+	if *sqlFlag == "auto" {
+		sql = !cross && haveSQLite
+	} else {
+		sql, err = strconv.ParseBool(*sqlFlag)
+		if err != nil {
+			log.Fatalf("Bad boolean --sql flag %q", *sqlFlag)
 		}
 	}
-	if *sql && !haveSQLite {
+
+	if cross && sql {
+		log.Fatalf("SQLite isn't available when cross-compiling to another OS. Set --sqlite=false.")
+	}
+	if sql && !haveSQLite {
 		log.Printf("SQLite not found. Either install it, or run make.go with --sqlite=false")
 		switch runtime.GOOS {
 		case "darwin":
@@ -95,7 +105,7 @@ func main() {
 	}
 
 	buildBaseDir := "build-gopath"
-	if !*sql {
+	if !sql {
 		buildBaseDir += "-nosqlite"
 	}
 
@@ -111,7 +121,7 @@ func main() {
 
 	if *verbose {
 		log.Printf("Camlistore version = %s", version)
-		log.Printf("SQLite included: %v", *sql)
+		log.Printf("SQLite included: %v", sql)
 		log.Printf("Temporary source: %s", buildSrcDir)
 		log.Printf("Output binaries: %s", binDir)
 	}
@@ -157,7 +167,7 @@ func main() {
 	deleteUnwantedOldMirrorFiles(buildSrcDir)
 
 	tags := ""
-	if *sql {
+	if sql {
 		tags = "with_sqlite"
 	}
 	baseArgs := []string{"install", "-v"}