| Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame^] | 1 | From 26a5aa6f70a0b98962884559668b3879dfe6fd02 Mon Sep 17 00:00:00 2001 |
| 2 | From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> |
| 3 | Date: Tue, 28 Nov 2023 12:32:51 +0300 |
| 4 | Subject: [PATCH] Fix finding msgpack 6+ |
| 5 | |
| 6 | msgpack.pc was renamed to msgpack-c.pc upstream in msgpack/msgpack-c#1053. |
| 7 | |
| 8 | Upstream-Status: Submitted [https://github.com/tmate-io/tmate/pull/281] |
| 9 | |
| 10 | Co-authored-by: Sam James <sam@gentoo.org> |
| 11 | Signed-off-by: alperak <alperyasinak1@gmail.com> |
| 12 | --- |
| 13 | configure.ac | 14 +++++++++++++- |
| 14 | 1 file changed, 13 insertions(+), 1 deletion(-) |
| 15 | |
| 16 | diff --git a/configure.ac b/configure.ac |
| 17 | index 028d5559..3badf9e2 100644 |
| 18 | --- a/configure.ac |
| 19 | +++ b/configure.ac |
| 20 | @@ -207,7 +207,19 @@ PKG_CHECK_MODULES( |
| 21 | LIBS="$MSGPACK_LIBS $LIBS" |
| 22 | found_msgpack=yes |
| 23 | ], |
| 24 | - found_msgpack=no |
| 25 | + [ |
| 26 | + # msgpack.pc was renamed to msgpack-c.pc in 6.0.0. |
| 27 | + PKG_CHECK_MODULES( |
| 28 | + MSGPACKC, |
| 29 | + msgpack-c >= 1.1.0, |
| 30 | + [ |
| 31 | + CPPFLAGS="$MSGPACKC_CFLAGS $CPPFLAGS" |
| 32 | + LIBS="$MSGPACKC_LIBS $LIBS" |
| 33 | + found_msgpack=yes |
| 34 | + ], |
| 35 | + found_msgpack=no |
| 36 | + ) |
| 37 | + ] |
| 38 | ) |
| 39 | if test "x$found_msgpack" = xno; then |
| 40 | AC_MSG_ERROR("msgpack >= 1.1.0 not found") |
| 41 | -- |
| 42 | 2.25.1 |
| 43 | |