From a5c6e80d3c54cd7faed52de5283b4f96bea86c13 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Sun, 5 Mar 2023 20:58:13 +0800 Subject: [PATCH 1/2] Fix finding msgpack 6+ `msgpack.pc` was renamed to `msgpack-c.pc` upstream in msgpack/msgpack-c#1053. --- configure.ac | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/configure.ac b/configure.ac index 028d55596..45c6085c5 100644 --- a/configure.ac +++ b/configure.ac @@ -209,6 +209,17 @@ PKG_CHECK_MODULES( ], found_msgpack=no ) +# msgpack.pc was renamed to msgpack-c.pc in 6.0.0. +PKG_CHECK_MODULES( + MSGPACKC, + msgpack-c >= 1.1.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.1.0 not found") fi From 2d79ff67f736c6c7473b22cb8553a06f3602ae71 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Mon, 3 Apr 2023 15:13:45 +0800 Subject: [PATCH 2/2] Avoid clobbering older msgpack versions Co-authored-by: Sam James --- configure.ac | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 45c6085c5..3badf9e28 100644 --- a/configure.ac +++ b/configure.ac @@ -207,18 +207,19 @@ PKG_CHECK_MODULES( LIBS="$MSGPACK_LIBS $LIBS" found_msgpack=yes ], - found_msgpack=no -) -# msgpack.pc was renamed to msgpack-c.pc in 6.0.0. -PKG_CHECK_MODULES( - MSGPACKC, - msgpack-c >= 1.1.0, [ - CPPFLAGS="$MSGPACKC_CFLAGS $CPPFLAGS" - LIBS="$MSGPACKC_LIBS $LIBS" - found_msgpack=yes - ], - found_msgpack=no + # msgpack.pc was renamed to msgpack-c.pc in 6.0.0. + PKG_CHECK_MODULES( + MSGPACKC, + msgpack-c >= 1.1.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.1.0 not found")