aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile5
-rwxr-xr-xconfigure5
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index c30ea45c..e66c7cac 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.433 2014/08/08 20:34:06 schwarze Exp $
+# $Id: Makefile,v 1.434 2014/08/08 23:47:21 schwarze Exp $
#
# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
# Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -488,7 +488,8 @@ mdocml.tar.gz: $(DISTFILES)
config.h: configure config.h.pre config.h.post $(TESTSRCS)
rm -f config.log
- CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure
+ CC="$(CC)" CFLAGS="$(CFLAGS)" DBLIB="$(DBLIB)" \
+ VERSION="$(VERSION)" ./configure
.PHONY: base-install cgi-install db-install install www-install
.PHONY: clean depend
diff --git a/configure b/configure
index 991c7669..8a6a74d9 100755
--- a/configure
+++ b/configure
@@ -33,10 +33,9 @@ echo "#define VERSION \"${VERSION}\""
runtest fgetln FGETLN
runtest getsubopt GETSUBOPT
runtest mmap MMAP
-runtest ohash OHASH -lutil
+runtest ohash OHASH "${DBLIB}"
runtest reallocarray REALLOCARRAY
-runtest sqlite3_errstr SQLITE3_ERRSTR \
- "-I/usr/local/include -L/usr/local/lib -lsqlite3"
+runtest sqlite3_errstr SQLITE3_ERRSTR "${DBLIB}"
runtest strcasestr STRCASESTR
runtest strlcat STRLCAT
runtest strlcpy STRLCPY