generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-12 10:33:52 +01:00
Code Issues Projects Releases Wiki Activity

Problem: autoconf does not use pkgconfig for NORM

Browse Source 
Solution: use the pkgconfig macro as the first step and then fallback
to manual checks
This commit is contained in:
Luca Boccassi 2017-10-16 23:23:32 +01:00
parent 39ad27c970
commit 78cdff3a3e
2 changed files with 24 additions and 9 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}
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}

28
configure.ac
View File

@ -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"