Control: tag -1 patch

On Tue, May 07, 2024 at 06:28:00AM -0400, James McCoy wrote:
> tmate-ssh-server FTBFS with the 6.x version of the msgpack C library.
> Upstream renamed the library from libmsgpackc to libmsgpack-c and the
> pkg-config file from msgpack.pc to msgpack-c.pc, so any checks for
> the presence of the library at build time should handle both names.

Attached patch, ported from tmate, enables building against either
version of msgpack-c.

Cheers,
-- 
James
GPG Key: 4096R/91BF BF4D 6956 BD5D F7B7  2D23 DFE6 91AE 331B A3DB
Description: Fix building with msgpack-c 6.x
 The msgpack-c project changed the library name from msgpackc to msgpack-c
 in the 6.0.0 release. Update configure.ac to detect the library both
 pre- and post-rename.
Bug: https://github.com/tmate-io/tmate-ssh-server/issues/108
Forwarded: not-needed
---
--- a/configure.ac
+++ b/configure.ac
@@ -199,7 +199,18 @@ PKG_CHECK_MODULES(
     LIBS="$MSGPACK_LIBS $LIBS"
     found_msgpack=yes
   ],
-  found_msgpack=no
+  [
+    PKG_CHECK_MODULES(
+      MSGPACKC,
+      msgpack-c >= 6.0.0,
+      [
+        CPPFLAGS="$MSGPACKC_CFLAGS $CPPFLAGS"
+        LIBS="$MSGPACKC_LIBS $LIBS"
+        found_msgpack=yes
+      ],
+      found_msgpack=no
+    )
+  ]
 )
 if test "x$found_msgpack" = xno; then
   AC_MSG_ERROR("msgpack >= 1.2.0 not found")

Reply via email to