firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 18:43:02 +01:00
Code Issues

Damyan's patch for distro-untegrated posix builds

Browse Source
This commit is contained in:
alexpeshkoff 2010-11-04 17:06:59 +00:00
parent db866e3a45
commit f694b301be
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builds/posix/make.defaults
View File

@ -272,10 +272,15 @@ LINK_PLUGIN_SYMBOLS = $(LINK_EMPTY_SYMBOLS)
LINK_EXEC_EXPORT=-rdynamic
LIB_PLATFORM_RPATH = -Wl,-rpath,$(1)
ifeq ($(strip @BINRELOC_CFLAGS@),)
LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),@FB_LIBDIR@,@FB_INTLDIR@))
ifeq (@USE_RPATH@,1)
ifeq ($(strip @BINRELOC_CFLAGS@),)
LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),@FB_LIBDIR@,@FB_INTLDIR@))
else
LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,'$$ORIGIN/../$(1)')
endif
else
LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,'$$ORIGIN/../$(1)')
LIB_LINK_RPATH =
endif
LIB_PATH_OPTS = $(call LIB_LINK_RPATH,lib) $(call LIB_LINK_RPATH,intl)
LIB_LINK_SONAME= -Wl,-soname,$(1)

8
configure.in
View File

@ -494,6 +494,14 @@ if test "$RAW_DEVICES_FLG" = "Y"; then
[Define this if databases on raw devices should be supported])
fi
AC_ARG_ENABLE(rpath,
[ --enable-rpath enable linking with RPATH (default)],
[],
[enable_rpath=yes])
if test "x$enable_rpath" != "xno" || test "x$enable_rpath" = "x" ; then
AC_SUBST(USE_RPATH, 1)
fi
AC_ARG_WITH(editline,
[ --with-editline support fancy command line editing],
[case "$withval" in