From d2431b1eef4853b037f935d7320cae8b9aa3d3d1 Mon Sep 17 00:00:00 2001
From: Cameron Cawley <ccawley2011@gmail.com>
Date: Wed, 27 Jul 2022 16:16:43 +0100
Subject: [PATCH] Fix compilation with BeOS and Haiku

---
 configure.ac | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index bfc4dfa..8a3a215 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,13 +20,14 @@ case "$host_os" in
 beos*|haiku*)
 	AS_IF([! which "$CXX" >/dev/null 2>/dev/null],
 		[AC_MSG_ERROR([C++ compiler required on this platform ($host_os)])])
+	CXXLD='$(CXX)'
 	;;
 *)
 	# Do not error out on linking when g++ is absent.
-	CXXLD='${CCLD}'
-	AC_SUBST([CXXLD])
+	CXXLD='$(CCLD)'
 	;;
 esac
+AC_SUBST([CXXLD])
 
 AC_PROG_INSTALL
 AM_INIT_AUTOMAKE([foreign subdir-objects tar-pax])