Commit d5f60369 authored by Pieter Hintjens's avatar Pieter Hintjens

Merge pull request #569 from jpoliv/master

Make "./configure --with-system-pgm" detect the OpenPGM 5.2 system library.
parents d1f011d7 42ab0e82
...@@ -349,10 +349,18 @@ fi ...@@ -349,10 +349,18 @@ fi
# Build with system openpgm # Build with system openpgm
if test "x$with_system_pgm_ext" != "xno"; then if test "x$with_system_pgm_ext" != "xno"; then
m4_ifdef([PKG_CHECK_MODULES], [ m4_ifdef([PKG_CHECK_MODULES], [
PKG_CHECK_MODULES([OpenPGM], [openpgm-5.1 >= 5.1]) have_pgm_system_library="no"
AC_DEFINE(ZMQ_HAVE_OPENPGM, 1, [Have OpenPGM extension]) PKG_CHECK_MODULES([OpenPGM], [openpgm-5.2 >= 5.2],
LIBZMQ_EXTRA_CXXFLAGS="$OpenPGM_CFLAGS $LIBZMQ_EXTRA_CXXFLAGS" [ have_pgm_system_library="yes" ],
LIBS="$OpenPGM_LIBS $LIBS" [PKG_CHECK_MODULES([OpenPGM], [openpgm-5.1 >= 5.1],
[ have_pgm_system_library="yes" ])
]
)
if test "x$have_pgm_system_library" = "xyes"; then
AC_DEFINE(ZMQ_HAVE_OPENPGM, 1, [Have OpenPGM extension])
LIBZMQ_EXTRA_CXXFLAGS="$OpenPGM_CFLAGS $LIBZMQ_EXTRA_CXXFLAGS"
LIBS="$OpenPGM_LIBS $LIBS"
fi
], ],
[AC_MSG_ERROR([--with-system-pgm requires a working pkg-config installation])]) [AC_MSG_ERROR([--with-system-pgm requires a working pkg-config installation])])
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment