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] 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 45c6085c..3badf9e2 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")