summary refs log tree commit diff
path: root/configure
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-05-18 16:45:23 -0400
committerJune McEnroe <june@causal.agency>2020-05-19 13:08:43 -0400
commitb0e371c63359ce326371bb039fd79afe4b7f18c7 (patch)
treeeb6296c6df0de26b03d729c74e9038aef19f3e36 /configure
parentAdd RUNDIR make variable (diff)
downloadpounce-b0e371c63359ce326371bb039fd79afe4b7f18c7.tar.gz
pounce-b0e371c63359ce326371bb039fd79afe4b7f18c7.zip
Rewrite build and install to be more amenable to packaging
Hopefully. Trying to write a FreeBSD port against this.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure43
1 files changed, 12 insertions, 31 deletions
diff --git a/configure b/configure
index 2936780..96224d0 100755
--- a/configure
+++ b/configure
@@ -3,43 +3,24 @@ set -eu
 
 base='-lcrypt'
 libs='libcrypto libtls'
+[ "$(uname)" = 'Darwin' ] && base=
 
 exec >config.mk
 
-case "$(uname)" in
-	(Darwin)
-		base=''
-		;;
-	(FreeBSD)
-		if ! pkg info -e libressl; then
-			echo 'LibreSSL required' >&2
-			exit 1
-		fi
-		prefix=$(pkg query '%p' libressl)
-		cat <<-EOF
-		MANDIR = \${PREFIX}/man
-		CFLAGS += -I${prefix}/include
-		CFLAGS += -D'OPENSSL_BIN="${prefix}/bin/openssl"'
-		LDFLAGS += -L${prefix}/lib
-		EOF
-		exit
-		;;
-	(Linux)
-		cat <<-EOF
-		CFLAGS += -D_GNU_SOURCE
-		CFLAGS += -D'CERTBOT_PATH="/etc/letsencrypt"'
-		LDLIBS.calico = \${LDLIBS}
-		RCS =
-		DIRS =
-		EOF
-		;;
-esac
-
 pkg-config --print-errors $libs
 
 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 = $base $(pkg-config --libs-only-l $libs)
+LDLIBS = ${base} $(pkg-config --libs-only-l $libs)
+CFLAGS += -D'OPENSSL_BIN="$(pkg-config --variable=exec_prefix openssl)/bin/openssl"'
+CFLAGS += -D'CERTBOT_PATH="/etc/letsencrypt"'
+INSTALLS =
 EOF
+
+if [ "$(uname)" = 'Linux' ]; then
+	cat <<-EOF
+	CFLAGS += -D_GNU_SOURCE
+	LDLIBS.calico = \${LDLIBS}
+	EOF
+fi
Enroe And increase XTerm internalBorder. 2021-02-07Set urgency on bell in xtermJune McEnroe 2021-02-07Add bindings for brightness controlJune McEnroe Weirdly the Fn key doesn't change how the F row registers... I wonder if I can do something about that. 2021-02-07Set X key repeat rateJune McEnroe 2021-02-07Bump font size to 12June McEnroe 11 is what I use on macOS, but I feel like my eyes are working harder here. 2021-02-07Fully configure and rebind cwmJune McEnroe This is sort of a mix of trying to emulate macOS somewhat for my muscle memory and just rebinding some of the cwm defaults to use 4- rather than M-. 2021-02-07Add BintiJune McEnroe 2021-02-07Finish configuring xtermJune McEnroe 2021-02-06Enable tapping, reverse scroll, set scaling in wsconsctlJune McEnroe 2021-02-06Set root window to black on purple snowJune McEnroe 2021-02-06Add xmodmap configurationJune McEnroe 2021-02-06Add initial OpenBSD X configurationJune McEnroe cwm still needs a lot more rebinding, and I need to actually look at its other options. xterm definitely still needs some configuration, but I at least managed to get it to use a decent looking font. Very happy that OpenBSD includes Luxi Mono, which is what my usual font, Go Mono, is based on anyway. Still missing is xmodmap and such. 2021-02-06Add xterm output to schemeJune McEnroe