aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeebs <seebs@seebs.net>2014-07-10 15:12:56 -0500
committerSeebs <seebs@seebs.net>2014-07-10 15:12:56 -0500
commit093516338afdf7a29889c9a2ce46facb8eef0e3f (patch)
tree6420b2c5d776d427e35fd976e3f0b8ef5df30d88
parentde1ca4c80976f64bff3d317e2082a6782b4c54ab (diff)
downloadpseudo-093516338afdf7a29889c9a2ce46facb8eef0e3f.tar.gz
pseudo-093516338afdf7a29889c9a2ce46facb8eef0e3f.tar.bz2
pseudo-093516338afdf7a29889c9a2ce46facb8eef0e3f.zip
don't pass -L/usr/lib
The sqlite flags don't need to be present if they don't have meaningful values. I think.
-rw-r--r--ChangeLog.txt4
-rw-r--r--Makefile.in2
-rwxr-xr-xconfigure6
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4d7a003..a5c152b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,7 @@
+2014-07-10:
+ * (seebs) Don't pass -L/usr/lib* for sqlite, because that's probably
+ the default.
+
2014-06-13:
* (seebs) don't follow symlinks for lutimes.
* (seebs) Use sizeof instead of strlen to initialize static value.
diff --git a/Makefile.in b/Makefile.in
index d5a78b5..7135dec 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,7 +43,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)"' $(SQLITE_MEMORY) $(FORCE_ASYNC) -DPSEUDO_PASSWD_FALLBACK='$(PASSWD_FALLBACK)'
CFLAGS_DEBUG=-O2 -g
-CFLAGS_SQL=-L$(SQLITE)/$(SQLITE_LIB) -I$(SQLITE)/include $(RPATH)
+@DEFAULT_SQLITE@CFLAGS_SQL=-L$(SQLITE)/$(SQLITE_LIB) -I$(SQLITE)/include $(RPATH)
CFLAGS_PSEUDO=$(CFLAGS_BASE) $(CFLAGS_CODE) $(CFLAGS_DEFS) \
$(CFLAGS_DEBUG) $(CFLAGS_SQL)
diff --git a/configure b/configure
index 88fbf8b..345c44b 100755
--- a/configure
+++ b/configure
@@ -267,6 +267,11 @@ else
SQLITE_MEMORY=""
fi
+# Suppress the -L if sqlite is in the default path.
+if [ "$opt_sqlite" = "/usr" ]; then
+ default_sqlite="# "
+fi
+
touch port_deps.mk
touch func_deps.mk
@@ -278,6 +283,7 @@ sed -e '
s,@SUFFIX@,'"$opt_suffix"',g
s,@SQLITE@,'"$opt_sqlite"',g
s,@ARCH_FLAGS@,'"$arch_flags"',g
+ s,@DEFAULT_SQLITE@,'"$default_sqlite"',g
s,@SQLITE_LDARG@,'"$sqlite_ldarg"',g
s,@SQLITE_LIB@,'"$opt_sqlite_lib"',g
s,@SQLITE_MEMORY@,'"$SQLITE_MEMORY"',g