diff options
| -rw-r--r-- | ChangeLog.txt | 4 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rwxr-xr-x | configure | 16 |
3 files changed, 21 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 777bcf9..f70429f 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,7 @@ +2010-09-15: + * (seebs) allow setting default RPATH entry distinct from sqlite3 + directory. + 2010-09-08: * (seebs) handle mkfifo without guaranteeing an EINVAL response. diff --git a/Makefile.in b/Makefile.in index f916788..2bf8197 100644 --- a/Makefile.in +++ b/Makefile.in @@ -23,6 +23,7 @@ SUFFIX=@SUFFIX@ SQLITE=@SQLITE@ BITS=@BITS@ MARK64=@MARK64@ +RPATH=@RPATH@ VERSION=0.3 LIB=lib$(MARK64) @@ -36,7 +37,7 @@ CFLAGS_BASE=-pipe -std=gnu99 -Wall -W -Wextra CFLAGS_CODE=-fPIC -D_LARGEFILE64_SOURCE -D_ATFILE_SOURCE -m$(BITS) 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 -Wl,-R$(SQLITE)/lib +CFLAGS_SQL=-L$(SQLITE)/lib -I$(SQLITE)/include $(RPATH) CFLAGS_PSEUDO=$(CFLAGS_BASE) $(CFLAGS_CODE) $(CFLAGS_DEFS) \ $(CFLAGS_DEBUG) $(CFLAGS_SQL) @@ -26,7 +26,11 @@ opt_sqlite=/usr usage() { echo >&2 "usage:" - echo >&2 " configure --prefix=... [--suffix=...] [--with-sqlite=...] [--bits=32|64]" + echo >&2 " configure --prefix=..." + echo >&2 " [--suffix=...]" + echo >&2 " [--with-sqlite=...]" + echo >&2 " [--with-rpath=...|--without-rpath]" + echo >&2 " [--bits=32|64]" exit 1 } @@ -39,6 +43,15 @@ do ;; --with-sqlite=*) opt_sqlite=${arg#--with-sqlite=} + # assign new value if unset + : ${opt_rpath=-Wl,-R\$(SQLITE)/lib} + ;; + --without-rpath) + opt_rpath='' + ;; + --with-rpath=*) + rpath=${arg#--with-rpath=} + opt_rpath=${rpath:+-Wl,-R$rpath} ;; --suffix=*) opt_suffix=${arg#--suffix=} @@ -82,6 +95,7 @@ sed -e ' s,@PREFIX@,'"$opt_prefix"',g s,@SUFFIX@,'"$opt_suffix"',g s,@SQLITE@,'"$opt_sqlite"',g + s!@RPATH@!'"$opt_rpath"'!g s,@MARK64@,'"$opt_mark64"',g s,@BITS@,'"$opt_bits"',g ' < Makefile.in > Makefile |