@@ -117,6 +117,14 @@ if [ "$(uname -s)" = 'FreeBSD' ]; then

 	LDFLAGS="$LDFLAGS -extld clang"

 fi

+# If sqlite3.h doesn't exist under /usr/include,

+# check /usr/local/include also just in case

+# (e.g. FreeBSD Ports installs it under the directory)

+if [ ! -e /usr/include/sqlite3.h ] && [ -e /usr/local/include/sqlite3.h ]; then

+	export CGO_CFLAGS='-I/usr/local/include'

+	export CGO_LDFLAGS='-L/usr/local/lib'

+fi

+

 HAVE_GO_TEST_COVER=

 if \

 	go help testflag | grep -- -cover > /dev/null \

deleted file mode 100644

@@ -1,25 +0,0 @@

-// +build amd64

-

-package graphdb

-

-import (

-	_ "code.google.com/p/gosqlite/sqlite3" // registers sqlite

-	"database/sql"

-	"os"

-)

-

-func NewSqliteConn(root string) (*Database, error) {

-	initDatabase := false

-	if _, err := os.Stat(root); err != nil {

-		if os.IsNotExist(err) {

-			initDatabase = true

-		} else {

-			return nil, err

-		}

-	}

-	conn, err := sql.Open("sqlite3", root)

-	if err != nil {

-		return nil, err

-	}

-	return NewDatabase(conn, initDatabase)

-}

new file mode 100644

@@ -0,0 +1,25 @@

+// +build linux,amd64 freebsd,cgo

+

+package graphdb

+

+import (

+	_ "code.google.com/p/gosqlite/sqlite3" // registers sqlite

+	"database/sql"

+	"os"

+)

+

+func NewSqliteConn(root string) (*Database, error) {

+	initDatabase := false

+	if _, err := os.Stat(root); err != nil {

+		if os.IsNotExist(err) {

+			initDatabase = true

+		} else {

+			return nil, err

+		}

+	}

+	conn, err := sql.Open("sqlite3", root)

+	if err != nil {

+		return nil, err

+	}

+	return NewDatabase(conn, initDatabase)

+}

@@ -1,4 +1,4 @@

-// +build !linux !amd64

+// +build !linux,!freebsd linux,!amd64 freebsd,!cgo

 package graphdb