From 84e30bfd69ecca1e65488cd857a66ed347133aaf Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Mon, 2 Mar 2020 18:28:20 -0500
Subject: Clean up configure script a bit

I still hate that any of this is necessary...
---
 configure | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/configure b/configure
index 7d1e424..75f2767 100755
--- a/configure
+++ b/configure
@@ -1,14 +1,22 @@
 #!/bin/sh
 set -eu
 
+base='-lcrypt'
+libs='libcrypto libtls'
+
+exec >config.mk
+
 case "$(uname)" in
+	(Darwin)
+		base=''
+		;;
 	(FreeBSD)
 		if ! pkg info -e libressl; then
-			echo 'LibreSSL required'
+			echo 'LibreSSL required' >&2
 			exit 1
 		fi
 		prefix=$(pkg query '%p' libressl)
-		cat >config.mk <<-EOF
+		cat <<-EOF
 		MANDIR = \${PREFIX}/man
 		CFLAGS += -I${prefix}/include
 		CFLAGS += -D'OPENSSL_BIN="${prefix}/bin/openssl"'
@@ -16,28 +24,21 @@ case "$(uname)" in
 		EOF
 		exit
 		;;
+	(Linux)
+		cat <<-EOF
+		CFLAGS += -D_GNU_SOURCE -D'CERTBOT_PATH="/etc/letsencrypt"'
+		LDLIBS_calico = \${LDLIBS}
+		RCS =
+		DIRS =
+		EOF
+		;;
 esac
 
-libs='libcrypto libtls'
 pkg-config --print-errors $libs
 
-cat >config.mk <<EOF
+cat <<EOF
 CFLAGS += $(pkg-config --cflags $libs)
 CFLAGS += -D'OPENSSL_BIN="$(pkg-config --variable=prefix openssl)/bin/openssl"'
 LDFLAGS += $(pkg-config --libs-only-L $libs)
-LDLIBS = -lcrypt $(pkg-config --libs-only-l $libs)
+LDLIBS = $base $(pkg-config --libs-only-l $libs)
 EOF
-
-case "$(uname)" in
-	(Darwin)
-		echo 'LDLIBS := ${LDLIBS:-lcrypt=}' >>config.mk
-		;;
-	(Linux)
-		cat >>config.mk <<-EOF
-		CFLAGS += -D_GNU_SOURCE -D'CERTBOT_PATH="/etc/letsencrypt"'
-		LDLIBS_calico = $(pkg-config --libs-only-l libcrypto)
-		RCS =
-		DIRS =
-		EOF
-		;;
-esac
-- 
cgit 1.4.1