From 2dc031a2b8fd3f2d93ada35f528b16610bbf8b47 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Wed, 22 Feb 2012 02:11:42 +0100 Subject: Added libxszmq compatibility library Signed-off-by: Martin Lucina --- configure.in | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 76105c5..f355968 100644 --- a/configure.in +++ b/configure.in @@ -17,15 +17,24 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # This lets us use PACKAGE_VERSION in Makefiles AC_SUBST(PACKAGE_VERSION) -# Libtool -version-info (ABI version) +# ABI version for libxs (Libtool -version-info) # # Don't change this unless you know exactly what you're doing and have read and # understand: # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html # # libxs -version-info current:revision:age -LTVER="0:0:0" -AC_SUBST(LTVER) +LIBXS_ABI_VERSION="0:0:0" +AC_SUBST(LIBXS_ABI_VERSION) + +# ABI version for libxszmq +# +# This must be set to the ABI version of libzmq we are emulating. +# This is currently libzmq 2.1 which is ABI 1.0.0. +# +# libxszmq -version-info current:revision:age +LIBXSZMQ_ABI_VERSION="1:0:0" +AC_SUBST(LIBXSZMQ_ABI_VERSION) # Take a copy of original flags XS_ORIG_CFLAGS="${CFLAGS:-none}" @@ -379,7 +388,7 @@ AC_SUBST(LIBXS_EXTRA_CXXFLAGS) AC_SUBST(LIBXS_EXTRA_LDFLAGS) AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile - perf/Makefile src/libxs.pc \ + perf/Makefile src/libxs.pc src/libxszmq.pc \ builds/msvc/Makefile tests/Makefile \ foreign/openpgm/Makefile]) AC_OUTPUT -- cgit v1.2.3 From c80d79f6faca9ff9435c8184f3511bbc5333dc6f Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Wed, 22 Feb 2012 03:01:21 +0100 Subject: Added optional drop-in libzmq library Enabled using --enable-libzmq-compat, this installs a drop-in libzmq library and headers. Not enabled by default since it will overwrite any existing libzmq install. Signed-off-by: Martin Lucina --- configure.in | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index f355968..45117e6 100644 --- a/configure.in +++ b/configure.in @@ -277,6 +277,17 @@ AC_HEADER_TIME AC_TYPE_UINT32_T AC_C_VOLATILE +# libzmq compatibility mode +libxs_libzmq_compat="no" +AC_ARG_ENABLE([libzmq-compat], [AS_HELP_STRING([--enable-libzmq-compat], + [install libzmq compatibility library and headers [default=no]])], + [enable_libzmq_compat=$enableval], [enable_libzmq_compat=no]) + +if test "x$enable_libzmq_compat" != "xno"; then + AC_MSG_NOTICE([enabling libzmq compatibility library and headers]) + libxs_libzmq_compat="yes" +fi + # PGM extension libxs_pgm_ext="no" @@ -369,6 +380,7 @@ if test "x$libxs_pedantic" = "xyes"; then fi AC_LANG_POP([C++]) +AM_CONDITIONAL(BUILD_LIBZMQ, test "x$libxs_libzmq_compat" = "xyes") AM_CONDITIONAL(BUILD_PGM, test "x$libxs_pgm_ext" = "xyes") AM_CONDITIONAL(ON_MINGW, test "x$libxs_on_mingw32" = "xyes") @@ -391,5 +403,14 @@ AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile perf/Makefile src/libxs.pc src/libxszmq.pc \ builds/msvc/Makefile tests/Makefile \ foreign/openpgm/Makefile]) +if test "x$libxs_libzmq_compat" == "xyes"; then + AC_CONFIG_FILES([src/libzmq.pc]) +fi AC_OUTPUT +if test "x$libxs_libzmq_compat" == "xyes"; then + AC_MSG_WARN([The --enable-libzmq-compat option was specified:]) + AC_MSG_WARN([libzmq compatibility library and headers are enabled.]) + AC_MSG_WARN([This will overwrite any existing installation of libzmq.]) +fi + -- cgit v1.2.3