Commit e1681731 authored by Martin Sustrik's avatar Martin Sustrik

Merge branch 'maint'

* maint:
  configure.in: Do not patch libtool rpath handling
  Fixing the Red Hat packaging
parents f22e85f1 57428db8
...@@ -13,7 +13,9 @@ AC_CONFIG_MACRO_DIR(config) ...@@ -13,7 +13,9 @@ AC_CONFIG_MACRO_DIR(config)
AM_CONFIG_HEADER(src/platform.hpp) AM_CONFIG_HEADER(src/platform.hpp)
AM_INIT_AUTOMAKE(tar-ustar dist-zip foreign) 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) # Libtool -version-info (ABI version)
# #
# Currently 0.0.0 ("unstable"). Don't change this unless you # Currently 0.0.0 ("unstable"). Don't change this unless you
...@@ -351,14 +353,3 @@ AC_OUTPUT(Makefile src/Makefile doc/Makefile ...@@ -351,14 +353,3 @@ AC_OUTPUT(Makefile src/Makefile doc/Makefile
devices/zmq_streamer/Makefile devices/zmq_queue/Makefile \ devices/zmq_streamer/Makefile devices/zmq_queue/Makefile \
builds/msvc/Makefile tests/Makefile) builds/msvc/Makefile tests/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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment