diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rwxr-xr-x | configure | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 83fc89f..56ea5e2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -38,7 +38,7 @@ CFLAGS_BASE=-pipe -std=gnu99 -Wall -W -Wextra CFLAGS_CODE=-fPIC -D_LARGEFILE64_SOURCE -D_ATFILE_SOURCE $(ARCH_FLAGS) CFLAGS_DEFS=-DPSEUDO_PREFIX='"$(PREFIX)"' -DPSEUDO_SUFFIX='"$(SUFFIX)"' -DPSEUDO_BINDIR='"$(BIN)"' -DPSEUDO_LIBDIR='"$(LIB)"' -DPSEUDO_LOCALSTATEDIR='"$(LOCALSTATE)"' -DPSEUDO_VERSION='"$(VERSION)"' CFLAGS_DEBUG=-O2 -g -CFLAGS_SQL=-L$(SQLITE)/lib -I$(SQLITE)/include $(RPATH) +CFLAGS_SQL=-L$(SQLITE)/$(LIB) -I$(SQLITE)/include $(RPATH) CFLAGS_PSEUDO=$(CFLAGS_BASE) $(CFLAGS_CODE) $(CFLAGS_DEFS) \ $(CFLAGS_DEBUG) $(CFLAGS_SQL) @@ -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='' |