generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-06 00:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2781 from bluca/norm_pkgconfig

Browse Source 
Problems: autoconf does not use pkgconfig for NORM, deb packages do not build with libnorm
This commit is contained in:
Jim Klimov 2017-10-17 02:29:25 +02:00 committed by GitHub
commit 920288b5b7
5 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -307,6 +307,11 @@ src_libzmq_la_CPPFLAGS += ${pgm_CFLAGS}
src_libzmq_la_LIBADD += ${pgm_LIBS} src_libzmq_la_LIBADD += ${pgm_LIBS}
endif endif
if HAVE_NORM
src_libzmq_la_CPPFLAGS += ${norm_CFLAGS}
src_libzmq_la_LIBADD += ${norm_LIBS}
endif
if BUILD_GSSAPI if BUILD_GSSAPI
src_libzmq_la_CPPFLAGS += ${gssapi_krb5_CFLAGS} src_libzmq_la_CPPFLAGS += ${gssapi_krb5_CFLAGS}
src_libzmq_la_LIBADD += ${gssapi_krb5_LIBS} src_libzmq_la_LIBADD += ${gssapi_krb5_LIBS}

28
configure.ac
View File

@ -537,19 +537,29 @@ AC_ARG_WITH([norm],
AC_MSG_CHECKING("with_norm_ext = ${with_norm_ext}") AC_MSG_CHECKING("with_norm_ext = ${with_norm_ext}")
if test "x$with_norm_ext" != "xno"; then if test "x$with_norm_ext" != "xno"; then
AC_MSG_RESULT([yes]) PKG_CHECK_MODULES([norm], [norm], [ have_norm_library="yes" ], [
AC_DEFINE(ZMQ_HAVE_NORM, 1, [Have NORM protocol extension]) AC_MSG_RESULT([yes])
if test "x$with_norm_ext" != "xyes"; then norm_LIBS=""
norm_path="${with_norm_ext}" norm_CFLAGS=""
LIBZMQ_EXTRA_CXXFLAGS="-I${norm_path}/include ${LIBZMQ_EXTRA_CXXFLAGS}" if test "x$with_norm_ext" != "xyes"; then
LIBZMQ_EXTRA_LDFLAGS="-L${norm_path}/lib ${LIBZMQ_EXTRA_LDFLAGS}" norm_path="${with_norm_ext}"
fi norm_CFLAGS="${norm_CFLAGS} -I${norm_path}/include"
LIBS="-L${norm_path}/lib -lnorm $LIBS" norm_LIBS="${norm_LIBS} -L${norm_path}/lib"
PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -lnorm" fi
norm_LIBS="${norm_LIBS} -lnorm"
have_norm_library="yes"
AC_SUBST(norm_LIBS)
AC_SUBST(norm_CFLAGS)
])
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi 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 # build using vmci
have_vmci_library="no" have_vmci_library="no"

1
packaging/debian/control
View File

@ -5,6 +5,7 @@ Maintainer: libzmq Developers <zeromq-dev@lists.zeromq.org>
Build-Depends: debhelper (>= 9), Build-Depends: debhelper (>= 9),
dh-autoreconf, dh-autoreconf,
libkrb5-dev, libkrb5-dev,
libnorm-dev,
libpgm-dev, libpgm-dev,
libsodium-dev, libsodium-dev,
libunwind-dev | libunwind8-dev | libunwind7-dev, libunwind-dev | libunwind8-dev | libunwind7-dev,

2
packaging/debian/rules
View File

@ -41,7 +41,7 @@ override_dh_clean:
rm -f config.log rm -f config.log
override_dh_auto_configure: 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: override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))

2
packaging/debian/zeromq.dsc.obs
View File

@ -6,7 +6,7 @@ Version: 4.2.3
Maintainer: libzmq Developers <zeromq-dev@lists.zeromq.org> Maintainer: libzmq Developers <zeromq-dev@lists.zeromq.org>
Homepage: http://www.zeromq.org/ Homepage: http://www.zeromq.org/
Standards-Version: 3.9.8 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: Package-List:
libzmq3-dev deb libdevel optional arch=any libzmq3-dev deb libdevel optional arch=any
libzmq5 deb libs optional arch=any libzmq5 deb libs optional arch=any