aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorPeter Seebach <peter.seebach@windriver.com>2012-11-02 19:55:57 -0500
committerPeter Seebach <peter.seebach@windriver.com>2012-11-02 20:03:05 -0500
commitb6c2409d786e53f62accc1c7a6538f39dd0ab601 (patch)
treee27d7cc5da8857e73439b16d65e55faa2cd9173e /configure
parent398a264490713c912b4ce465251a8a82a7905f45 (diff)
downloadpseudo-b6c2409d786e53f62accc1c7a6538f39dd0ab601.tar.gz
pseudo-b6c2409d786e53f62accc1c7a6538f39dd0ab601.tar.bz2
pseudo-b6c2409d786e53f62accc1c7a6538f39dd0ab601.zip
Makefile.in/configure: Use $(LIB), not hardcoded lib, for sqlite
It turns out that the -L usage mostly doesn't matter (usually something else has requested the right directory, or it's the default), but the explicit path to libsqlite3.a hardcoded "lib", and on some systems it should be something else, such as "lib64". Solution: Use $(LIB) for that directory. Note that this may not resolve things if, say, you're doing MIPS n32 on a target where that lives in /usr/lib32, but I think in that case you'd be specifying $libdir, so it should still work out. Also added --with-static-sqlite=/path as an option in case people need to further outsmart this. Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 8 insertions, 2 deletions
diff --git a/configure b/configure
index 4a41943..c536f58 100755
--- a/configure
+++ b/configure
@@ -37,6 +37,7 @@ usage()
echo >&2 " [--suffix=...]"
echo >&2 " [--with-sqlite=...]"
echo >&2 " [--enable-static-sqlite]"
+ echo >&2 " [--with-static-sqlite=...]"
echo >&2 " [--with-rpath=...|--without-rpath]"
echo >&2 " [--cflags='']"
echo >&2 " [--bits=32|64]"
@@ -58,14 +59,19 @@ do
--libdir=*)
opt_libdir=${arg#--libdir=}
;;
+ --with-static-sqlite=*)
+ opt_sqlite_ldarg=${arg#--with-static-sqlite=}
+ sqlite_ldarg=$opt_sqlite_ldarg
+ use_maybe_rpath=false
+ ;;
--enable-static-sqlite)
- sqlite_ldarg='$(SQLITE)/lib/libsqlite3.a'
+ sqlite_ldarg='$(SQLITE)/$(LIB)/libsqlite3.a'
use_maybe_rpath=false
;;
--with-sqlite=*)
opt_sqlite=${arg#--with-sqlite=}
# assign new value if unset
- maybe_rpath='-Wl,-R$(SQLITE)/lib'
+ maybe_rpath='-Wl,-R$(SQLITE)/$(LIB)'
;;
--without-rpath)
opt_rpath=''