[Firebird-checkins] SF.net SVN: firebird:[51844] firebird/trunk

[<ale...@us...>]

Revision: 51844
          http://firebird.svn.sourceforge.net/firebird/?rev=51844&view=rev
Author:   alexpeshkoff
Date:     2010-11-04 17:06:59 +0000 (Thu, 04 Nov 2010)

Log Message:
-----------
Damyan's patch for distro-untegrated posix builds

Modified Paths:
--------------
    firebird/trunk/builds/posix/make.defaults
    firebird/trunk/configure.in

Modified: firebird/trunk/builds/posix/make.defaults
===================================================================
--- firebird/trunk/builds/posix/make.defaults	2010-11-04 16:22:42 UTC (rev 51843)
+++ firebird/trunk/builds/posix/make.defaults	2010-11-04 17:06:59 UTC (rev 51844)
@@ -272,10 +272,15 @@
 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)

Modified: firebird/trunk/configure.in
===================================================================
--- firebird/trunk/configure.in	2010-11-04 16:22:42 UTC (rev 51843)
+++ firebird/trunk/configure.in	2010-11-04 17:06:59 UTC (rev 51844)
@@ -494,6 +494,14 @@
     [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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.