diff options
-rw-r--r-- | ChangeLog.txt | 1 | ||||
-rw-r--r-- | Makefile.in | 2 | ||||
-rwxr-xr-x | configure | 7 |
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 1d645b0..e78d5a9 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,6 +1,7 @@ 2012-03-27: * (seebs) Merge in: * (mhatle) Improve configuration compatibility with OE-Core. + * (seebs) Provide option to statically link libsqlite. 2012-03-26: * (seebs) Add popen() call to set up environment. diff --git a/Makefile.in b/Makefile.in index 5808e4c..13d396a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -56,7 +56,7 @@ WRAPOBJS=pseudo_wrappers.o # needed for anything that links with pseduo_client.o, pretty much CLIENT_LDFLAGS=-ldl -lpthread -DB_LDFLAGS=-lsqlite3 -lpthread +DB_LDFLAGS=@SQLITE_LDARG@ -lpthread PSEUDO=$(BIN)/pseudo PSEUDODB=$(BIN)/pseudodb @@ -31,11 +31,14 @@ usage() echo >&2 " [--libdir=...]" echo >&2 " [--suffix=...]" echo >&2 " [--with-sqlite=...]" + echo >&2 " [--enable-static-sqlite]" echo >&2 " [--with-rpath=...|--without-rpath]" echo >&2 " [--bits=32|64]" exit 1 } +sqlite_ldarg=-lsqlite3 + for arg do case $arg in @@ -46,6 +49,9 @@ do --libdir=*) opt_libdir=${arg#--libdir=} ;; + --enable-static-sqlite) + sqlite_ldarg='$(SQLITE)/lib/libsqlite3.a' + ;; --with-sqlite=*) opt_sqlite=${arg#--with-sqlite=} # assign new value if unset @@ -114,6 +120,7 @@ sed -e ' s,@LIB@,'"$opt_lib"',g s,@SUFFIX@,'"$opt_suffix"',g s,@SQLITE@,'"$opt_sqlite"',g + s,@SQLITE_LDARG@,'"$sqlite_ldarg"',g s!@RPATH@!'"$opt_rpath"'!g s,@MARK64@,'"$opt_mark64"',g s,@BITS@,'"$opt_bits"',g |