Do not hardcode stuff in ./configure that is actually user-configurable

in the Makefile; instead, pass it down via the environment just
like CFLAGS.
Nice suggestion from kristaps@ hoping to make MacOS X happier.

2 files changed, 4 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index c0270030..a167762c 100644
--- a/Makefile
+++ b/Makefile
@@ -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