diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-10-11 16:42:10 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-10-11 16:42:10 +0200 |
| commit | e168173162dd26238a799c19142bab8b7885ebb3 (patch) | |
| tree | 893bcf722d3611bc5437bdbd5fd0db5ae518f321 | |
| parent | f22e85f19f2bf58285e4984e875487f17c85e791 (diff) | |
| parent | 57428db89885631128cb9a48b334b050eb83a512 (diff) | |
Merge branch 'maint'
* maint:
configure.in: Do not patch libtool rpath handling
Fixing the Red Hat packaging
| -rw-r--r-- | configure.in | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/configure.in b/configure.in index 88286ba..42a820d 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 @@ -351,14 +353,3 @@ AC_OUTPUT(Makefile src/Makefile doc/Makefile devices/zmq_streamer/Makefile devices/zmq_queue/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 - - |