about summary refs log tree commit diff
path: root/extra/palaver/configure
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2021-05-02 20:35:48 -0400
committerJune McEnroe <june@causal.agency>2021-05-02 20:35:48 -0400
commit8d27209e1872046eb1eba24a7ff85488f6c28ed4 (patch)
tree71194623fbc21cfa27054cc263e76a2da9f63c0f /extra/palaver/configure
parentpalaver: Exit on getopt failure (diff)
downloadpounce-8d27209e1872046eb1eba24a7ff85488f6c28ed4.tar.gz
pounce-8d27209e1872046eb1eba24a7ff85488f6c28ed4.zip
Clean up Makefiles, configure scripts
Default MANDIR to ${PREFIX}/man since it turns out man-db includes
/usr/local/man by default. Add support for BINDIR. Separate libs
out into LDADD variables.
Diffstat (limited to 'extra/palaver/configure')
-rwxr-xr-xextra/palaver/configure20
1 files changed, 10 insertions, 10 deletions
diff --git a/extra/palaver/configure b/extra/palaver/configure
index 65c82fe..bce92be 100755
--- a/extra/palaver/configure
+++ b/extra/palaver/configure
@@ -4,27 +4,28 @@ set -eu
 cflags() {
 	echo "CFLAGS += $*"
 }
-ldlibs() {
-	echo "LDLIBS ${o:-}= $*"
-	o=+
-}
-config() {
-	pkg-config --print-errors "$@"
-	cflags $(pkg-config --cflags "$@")
-	ldlibs $(pkg-config --libs "$@")
-}
 defstr() {
 	cflags "-D'$1=\"$2\"'"
 }
 defvar() {
 	defstr "$1" "$(pkg-config --variable=$3 $2)${4:-}"
 }
+ldadd() {
+	lib=$1; shift
+	echo "LDADD.${lib} = $*"
+}
+config() {
+	pkg-config --print-errors "$@"
+	cflags $(pkg-config --cflags "$@")
+	for lib; do ldadd $lib $(pkg-config --libs $lib); done
+}
 
 exec >config.mk
 
 for opt; do
 	case "${opt}" in
 		(--prefix=*) echo "PREFIX = ${opt#*=}" ;;
+		(--bindir=*) echo "BINDIR = ${opt#*=}" ;;
 		(--mandir=*) echo "MANDIR = ${opt#*=}" ;;
 		(*) echo "warning: unsupported option ${opt}" >&2 ;;
 	esac
@@ -32,7 +33,6 @@ done
 
 case "$(uname)" in
 	(OpenBSD)
-		ldlibs -ltls
 		config libcurl sqlite3
 		;;
 	(Linux)