From 6cd0867f0208b4fca4cfca2a2ff7bc0de5199d4a Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 11 Oct 2010 16:32:27 +0200 Subject: Fixing the Red Hat packaging When adding ZMQ_VERSION macros, I incorrectly removed the PACKAGE_VERSION macro. Adding it back. Signed-off-by: Martin Sustrik --- configure.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 25a4eed..b2dd93c 100644 --- a/configure.in +++ b/configure.in @@ -13,7 +13,9 @@ AC_CONFIG_MACRO_DIR(config) AM_CONFIG_HEADER(src/platform.hpp) AM_INIT_AUTOMAKE(tar-ustar dist-zip foreign) -# +# This lets us use PACKAGE_VERSION in Makefiles +AC_SUBST(PACKAGE_VERSION) + # Libtool -version-info (ABI version) # # Currently 0.0.0 ("unstable"). Don't change this unless you -- cgit v1.2.3 From 57428db89885631128cb9a48b334b050eb83a512 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Mon, 11 Oct 2010 16:39:48 +0200 Subject: configure.in: Do not patch libtool rpath handling For historic reasons (mainly compatbility with really old libtool), configure was patching libtool to not use rpath in binaries. This breaks (among other things) correct operation of "make check" since the test binaries may not be run with the correct shared library version. Current best practice as seen e.g. at http://wiki.debian.org/RpathIssue suggests that this is no longer an issue, so I'm removing the code that patches libtool. Signed-off-by: Martin Lucina --- configure.in | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index b2dd93c..405f27c 100644 --- a/configure.in +++ b/configure.in @@ -365,14 +365,3 @@ AC_OUTPUT(Makefile src/Makefile doc/Makefile devices/zmq_streamer/Makefile devices/zmq_queue/Makefile \ builds/msvc/Makefile) -# On Linux patch libtool to delete hardcoded paths (rpath). -case "${host_os}" in - *linux*) - sed < libtool > libtool-2 \ - 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" "/' - mv libtool-2 libtool - chmod 755 libtool - ;; -esac - - -- cgit v1.2.3