commit - 0082f4263cebb5303ddc4ef027a0bc6b79bbe50a
commit + 4d31a59300a8afc37181e8d19e8482151acad93a
blob - 2da1175b68c31e2b9f572288f297455ed0b351c8
blob + d7781879ab1ec4154e55c6d8548add0bee98a516
--- configure.ac
+++ configure.ac
@@ -64,7 +64,7 @@ AC_MSG_NOTICE([Using default-editor: $DEFAULT_EDITOR])
 AC_DEFINE_UNQUOTED([DEFAULT_EDITOR], ["$DEFAULT_EDITOR"], [The default editor])
 
 DEFAULT_OPENER=xdg-open
-AS_IF([test "x$platform" = "xdarwin"], [
+AS_IF([test "x$PLATFORM" = "xdarwin"], [
 	DEFAULT_OPENER=open
 ])
 
@@ -90,7 +90,14 @@ AS_IF([test "x$with_libbsd" = "xyes"], [
 if test "x$PLATFORM" = "xdarwin"; then
 	export LDFLAGS="-L/opt/homebrew/opt/libressl/lib $LDFLAGS"
 	export CPPFLAGS="-I/opt/homebrew/opt/libressl/include $CPPFLAGS"
-	export PKG_CONFIG_PATH="/opt/homebrew/opt/libressl/lib/pkgconfig $PKG_CONFIG_PATH"
+
+	# This is not neat at all -- but if homebrew is used, it's often up to
+	# the user to define PKG_CONFIG_PATH in the environment.
+	# Some CI systems don't do this, so we'll have to.
+	AC_MSG_NOTICE([Setting PKG_CONFIG_PATH programatically])
+	export PKG_CONFIG_PATH="$(find ${HOMEBREW_PREFIX}/Cellar \
+				 -name 'pkgconfig' -type d | \
+				 tr '\n' ':' | sed s/.$//):$PKG_CONFIG_PATH"
 fi
 
 AC_REPLACE_FUNCS([
blob - b2b5b6e785c3cd9571421ece363546fa3fcff6e9
blob + c24d6c1b839c18314dd937894328796ee3b2fc45
--- mailcap.c
+++ mailcap.c
@@ -32,7 +32,7 @@
 #include "mailcap.h"
 #include "xwrapper.h"
 
-#define DEFAULT_MAILCAP_ENTRY "*/*; "DEFAULT_OPENER" %s"
+#define DEFAULT_MAILCAP_ENTRY "*/*; "DEFAULT_OPENER" %s; needsterminal"
 
 #define str_unappend(ch) if (sps.off > 0 && (ch) != EOF) { sps.off--; }