diff --git a/Makefile.am b/Makefile.am index b68bad7c..fc9fd309 100644 --- a/Makefile.am +++ b/Makefile.am @@ -307,6 +307,11 @@ src_libzmq_la_CPPFLAGS += ${pgm_CFLAGS} src_libzmq_la_LIBADD += ${pgm_LIBS} endif +if HAVE_NORM +src_libzmq_la_CPPFLAGS += ${norm_CFLAGS} +src_libzmq_la_LIBADD += ${norm_LIBS} +endif + if BUILD_GSSAPI src_libzmq_la_CPPFLAGS += ${gssapi_krb5_CFLAGS} src_libzmq_la_LIBADD += ${gssapi_krb5_LIBS} diff --git a/configure.ac b/configure.ac index 017de276..98adfdb4 100644 --- a/configure.ac +++ b/configure.ac @@ -537,19 +537,29 @@ AC_ARG_WITH([norm], AC_MSG_CHECKING("with_norm_ext = ${with_norm_ext}") if test "x$with_norm_ext" != "xno"; then - AC_MSG_RESULT([yes]) - AC_DEFINE(ZMQ_HAVE_NORM, 1, [Have NORM protocol extension]) + PKG_CHECK_MODULES([norm], [norm], [ have_norm_library="yes" ], [ + AC_MSG_RESULT([yes]) - if test "x$with_norm_ext" != "xyes"; then - norm_path="${with_norm_ext}" - LIBZMQ_EXTRA_CXXFLAGS="-I${norm_path}/include ${LIBZMQ_EXTRA_CXXFLAGS}" - LIBZMQ_EXTRA_LDFLAGS="-L${norm_path}/lib ${LIBZMQ_EXTRA_LDFLAGS}" - fi - LIBS="-L${norm_path}/lib -lnorm $LIBS" - PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -lnorm" + norm_LIBS="" + norm_CFLAGS="" + if test "x$with_norm_ext" != "xyes"; then + norm_path="${with_norm_ext}" + norm_CFLAGS="${norm_CFLAGS} -I${norm_path}/include" + norm_LIBS="${norm_LIBS} -L${norm_path}/lib" + fi + norm_LIBS="${norm_LIBS} -lnorm" + have_norm_library="yes" + AC_SUBST(norm_LIBS) + AC_SUBST(norm_CFLAGS) + ]) else AC_MSG_RESULT([no]) fi +if test "x$have_norm_library" = "xyes"; then + AC_DEFINE(ZMQ_HAVE_NORM, [1], [Have NORM protocol extension]) + PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE $norm_LIBS" +fi +AM_CONDITIONAL(HAVE_NORM, test "x$have_norm_library" = "xyes") # build using vmci have_vmci_library="no" diff --git a/packaging/debian/control b/packaging/debian/control index d897a422..0acc813c 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -5,6 +5,7 @@ Maintainer: libzmq Developers Build-Depends: debhelper (>= 9), dh-autoreconf, libkrb5-dev, + libnorm-dev, libpgm-dev, libsodium-dev, libunwind-dev | libunwind8-dev | libunwind7-dev, diff --git a/packaging/debian/rules b/packaging/debian/rules index 608d614a..d60e240d 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -41,7 +41,7 @@ override_dh_clean: rm -f config.log override_dh_auto_configure: - dh_auto_configure -- --with-pgm --with-libsodium --enable-drafts=$(DRAFTS) --with-libgssapi_krb5=yes + dh_auto_configure -- --with-pgm --with-libsodium --enable-drafts=$(DRAFTS) --with-libgssapi_krb5=yes --with-norm=yes override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) diff --git a/packaging/debian/zeromq.dsc.obs b/packaging/debian/zeromq.dsc.obs index 5d7ad2d3..22ef5be9 100644 --- a/packaging/debian/zeromq.dsc.obs +++ b/packaging/debian/zeromq.dsc.obs @@ -6,7 +6,7 @@ Version: 4.2.3 Maintainer: libzmq Developers Homepage: http://www.zeromq.org/ Standards-Version: 3.9.8 -Build-Depends: debhelper (>= 9), dh-autoreconf, libkrb5-dev, libpgm-dev, libsodium-dev, libunwind-dev | libunwind8-dev | libunwind7-dev, pkg-config, asciidoc-base | asciidoc, xmlto +Build-Depends: debhelper (>= 9), dh-autoreconf, libkrb5-dev, libpgm-dev, libnorm-dev, libsodium-dev, libunwind-dev | libunwind8-dev | libunwind7-dev, pkg-config, asciidoc-base | asciidoc, xmlto Package-List: libzmq3-dev deb libdevel optional arch=any libzmq5 deb libs optional arch=any