Mailing List Archive

[PATCH 01/23] configure: add with-zeromq and with-ccapnproto configuration parameter
Those config parameters permit usage of zeromq library and capnproto
library. Those two config parameters are necessary in order to use
capnproto configuration interface that will be needed by BGP.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
---
configure.ac | 37 ++++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index ce1bb7ea713d..6a48c5c544e1 100755
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
##
AC_PREREQ(2.60)

-AC_INIT(Quagga, 1.1.0, [https://bugzilla.quagga.net])
+AC_INIT(Quagga, 1.1.0-dev, [https://bugzilla.quagga.net])
CONFIG_ARGS="$*"
AC_SUBST(CONFIG_ARGS)
AC_CONFIG_SRCDIR(lib/zebra.h)
@@ -1497,6 +1497,41 @@ AC_CHECK_HEADER([malloc.h],
)
], [], QUAGGA_INCLUDES)

+dnl ------
+dnl ZeroMQ
+dnl ------
+if test "$with_zeromq" != "no"; then
+ AC_SEARCH_LIBS([zmq_msg_init], [zmq], [
+ AC_DEFINE(HAVE_ZEROMQ, 1, [Enable ZeroMQ support])
+ AC_DEFINE(ZEROMQ_CFLAGS, $(ZEROMQ_CFLAGS), [cflags for zeromq])
+ AC_DEFINE(ZEROMQ_LIBS, $(ZEROMQ_LIBS), [ldflags for zeromq])
+ ZEROMQ=true
+ AC_SUBST(ZEROMQ_CFLAGS)
+ AC_SUBST(ZEROMQ_LIBS)
+ ], [
+ AC_MSG_ERROR([configuration specifies --with-zeromq but libzmq was not found])
+ ])
+fi
+
+dnl ------
+dnl capnproto
+dnl ------
+if test "$with_ccapnproto" != "no"; then
+ AC_SEARCH_LIBS([capn_init_malloc], [capn_c], [
+ AC_DEFINE(HAVE_CCAPNPROTO, 1, [Enable c-capnproto support])
+ AC_DEFINE(CAPN_C_CFLAGS, $(CAPN_C_CFLAGS), [cflags for c-capnproto])
+ AC_DEFINE(CAPN_C_LIBS, $(CAPN_C_LIBS), [ldflags for c-capnproto])
+ CCAPNPROTO=true
+ AC_SUBST(CAPN_C_CFLAGS)
+ AC_SUBST(CAPN_C_LIBS)
+ ], [
+ AC_MSG_ERROR([ccapnproto needed but libcapn_c was not found])
+ ])
+fi
+
+AM_CONDITIONAL([HAVE_ZEROMQ], test "x$ZEROMQ" = "xtrue")
+AM_CONDITIONAL([HAVE_CCAPNPROTO], test "x$CCAPNPROTO" = "xtrue")
+
dnl ----------
dnl configure date
dnl ----------
--
2.1.4


_______________________________________________
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev
[PATCH 01/23] configure: add with-zeromq and with-ccapnproto configuration parameter [ In reply to ]
Those config parameters permit usage of zeromq library and capnproto
library. Those two config parameters are necessary in order to use
capnproto configuration interface that will be needed by BGP.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
---
configure.ac | 37 ++++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index ce1bb7ea713d..6a48c5c544e1 100755
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
##
AC_PREREQ(2.60)

-AC_INIT(Quagga, 1.1.0, [https://bugzilla.quagga.net])
+AC_INIT(Quagga, 1.1.0-dev, [https://bugzilla.quagga.net])
CONFIG_ARGS="$*"
AC_SUBST(CONFIG_ARGS)
AC_CONFIG_SRCDIR(lib/zebra.h)
@@ -1497,6 +1497,41 @@ AC_CHECK_HEADER([malloc.h],
)
], [], QUAGGA_INCLUDES)

+dnl ------
+dnl ZeroMQ
+dnl ------
+if test "$with_zeromq" != "no"; then
+ AC_SEARCH_LIBS([zmq_msg_init], [zmq], [
+ AC_DEFINE(HAVE_ZEROMQ, 1, [Enable ZeroMQ support])
+ AC_DEFINE(ZEROMQ_CFLAGS, $(ZEROMQ_CFLAGS), [cflags for zeromq])
+ AC_DEFINE(ZEROMQ_LIBS, $(ZEROMQ_LIBS), [ldflags for zeromq])
+ ZEROMQ=true
+ AC_SUBST(ZEROMQ_CFLAGS)
+ AC_SUBST(ZEROMQ_LIBS)
+ ], [
+ AC_MSG_ERROR([configuration specifies --with-zeromq but libzmq was not found])
+ ])
+fi
+
+dnl ------
+dnl capnproto
+dnl ------
+if test "$with_ccapnproto" != "no"; then
+ AC_SEARCH_LIBS([capn_init_malloc], [capn_c], [
+ AC_DEFINE(HAVE_CCAPNPROTO, 1, [Enable c-capnproto support])
+ AC_DEFINE(CAPN_C_CFLAGS, $(CAPN_C_CFLAGS), [cflags for c-capnproto])
+ AC_DEFINE(CAPN_C_LIBS, $(CAPN_C_LIBS), [ldflags for c-capnproto])
+ CCAPNPROTO=true
+ AC_SUBST(CAPN_C_CFLAGS)
+ AC_SUBST(CAPN_C_LIBS)
+ ], [
+ AC_MSG_ERROR([ccapnproto needed but libcapn_c was not found])
+ ])
+fi
+
+AM_CONDITIONAL([HAVE_ZEROMQ], test "x$ZEROMQ" = "xtrue")
+AM_CONDITIONAL([HAVE_CCAPNPROTO], test "x$CCAPNPROTO" = "xtrue")
+
dnl ----------
dnl configure date
dnl ----------
--
2.1.4


_______________________________________________
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev