summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikko Koppanen <mkoppanen@php.net>2011-04-02 22:48:52 +0200
committerMartin Sustrik <sustrik@250bpm.com>2011-04-02 22:48:52 +0200
commit7af18468f8ca0c14975ea12a1e6a549d42b81347 (patch)
tree9f88c38880512075e8a099011a45f4c1b69d1053
parent0e0e4559a0e1d37fdbf686056f5d869d7a8d0315 (diff)
Add option to build with system opepgm
Signed-off-by: Mikko Koppanen <mkoppanen@php.net>
-rwxr-xr-xautogen.sh6
-rw-r--r--configure.in17
2 files changed, 23 insertions, 0 deletions
diff --git a/autogen.sh b/autogen.sh
index 2cc40b9..75f1009 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,6 +20,12 @@
# Script to generate all required files from fresh git checkout.
+command -v pkg-config >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+ echo "autogen.sh: error: could not find pkg-config. pkg-config is required to run autogen.sh." 1>&2
+ exit 1
+fi
+
command -v libtool >/dev/null 2>&1
if [ $? -ne 0 ]; then
echo "autogen.sh: error: could not find libtool. libtool is required to run autogen.sh." 1>&2
diff --git a/configure.in b/configure.in
index 6df80ab..bd0e848 100644
--- a/configure.in
+++ b/configure.in
@@ -273,6 +273,15 @@ AC_ARG_WITH([pgm], [AS_HELP_STRING([--with-pgm],
[build libzmq with PGM extension [default=no]])],
[with_pgm_ext=$withval], [with_pgm_ext=no])
+# build using system pgm
+AC_ARG_WITH([system-pgm], [AS_HELP_STRING([--with-system-pgm],
+ [build libzmq with PGM extension [default=no]])],
+ [with_system_pgm_ext=yes], [with_system_pgm_ext=no])
+
+if test "x$with_pgm_ext" != "xno" -a "x$with_system_pgm_ext" != "xno"; then
+ AC_MSG_ERROR([--with-pgm and --with-system-pgm cannot be specified together])
+fi
+
if test "x$with_pgm_ext" != "xno"; then
# This allows placing the tar.gz to foreign/openpgm
@@ -319,6 +328,14 @@ if test "x$with_pgm_ext" != "xno"; then
ac_zmq_pgm_ext="yes"
fi
+# Build with system openpgm
+if test "x$with_system_pgm_ext" != "xno"; then
+ PKG_CHECK_MODULES([OpenPGM], [openpgm-5.1 >= 5.1])
+ AC_DEFINE(ZMQ_HAVE_OPENPGM, 1, [Have OpenPGM extension])
+ LIBZMQ_EXTRA_CXXFLAGS="$OpenPGM_CFLAGS $LIBZMQ_EXTRA_CXXFLAGS"
+ LIBS="$OpenPGM_LIBS $LIBS"
+fi
+
AC_SUBST(pgm_basename)
# Set -Wall, -Werror and -pedantic