From dd5603d6e95e22e8b9f963680e99e11de6a4de3a Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 12 Feb 2014 11:22:37 -0800 Subject: [PATCH] Updated NEWS for #909 --- NEWS | 2 ++ src/Makefile.am | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index a61f6f1b..1726133c 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,8 @@ Bug Fixes --------- +* Fixed #909; out of tree build issue on Linux. + * Fixed #888; hangs on terminate when inproc connected but never bound. * Fixed #868; assertion failure at ip.cpp:137 when using port scanner. diff --git a/src/Makefile.am b/src/Makefile.am index 0f0ed9be..d879a238 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -173,7 +173,11 @@ else if ON_ANDROID libzmq_la_LDFLAGS = -avoid-version -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@ else -libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@ -Wl,--version-script=libzmq.vers +if ON_LINUX +libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@ -Wl,--version-script=$(srcdir)/libzmq.vers +else +libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@ -Wl +endif endif endif