nobu	2010-11-06 07:28:45 +0900 (Sat, 06 Nov 2010)

  New Revision: 29703

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29703

  Log:
    * configure.in (LIBRUBY_RELATIVE): use rpath token expansion.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 29702)
+++ configure.in	(revision 29703)
@@ -2192,6 +2192,7 @@
        AS_HELP_STRING([--enable-shared], [build a shared library for Ruby]),
        [enable_shared=$enableval])
 libprefix='$(libdir)'
+LIBRUBY_RELATIVE=no
 AS_CASE("$enable_shared", [yes], [
   LIBRUBY='$(LIBRUBY_SO)'
   LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
@@ -2208,6 +2209,10 @@
     [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu], [
 	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
+	if test "$load_relative" = yes; then
+	    LIBRUBY_RPATHFLAGS="'-Wl,-rpath,\$\${ORIGIN}/../lib'"
+	    LIBRUBY_RELATIVE=yes
+	fi
 	],
     [freebsd*|dragonfly*], [
 	SOLIBS='$(LIBS)'
@@ -2261,6 +2266,7 @@
 	LIBRUBY_LDSHARED='$(CC) -dynamiclib'
 	if test "$load_relative" = yes; then
 	    libprefix='@executable_path/../lib'
+	    LIBRUBY_RELATIVE=yes
 	fi
 	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'
 	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)'
@@ -2280,10 +2286,12 @@
   LIBRUBYARG_SHARED=
 ])
 if test "$enable_rpath" = yes; then
-    LIBRUBY_RPATHFLAGS="${linker_flag}-R ${linker_flag}${libprefix} -L\$(libdir)"
+    test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
+    LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${libprefix} -L\$(libdir)"
     LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
     LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
 fi
+AC_SUBST(LIBRUBY_RELATIVE)
 
 LDFLAGS="-L. $LDFLAGS"
 AC_SUBST(ARCHFILE)
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29702)
+++ ChangeLog	(revision 29703)
@@ -1,3 +1,7 @@
+Sat Nov  6 07:28:39 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (LIBRUBY_RELATIVE): use rpath token expansion.
+
 Sat Nov  6 07:24:01 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* template/ruby.pc.in (arch, sitearch): reordered.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/