ruby-changes:15995
From: nobu <ko1@a...>
Date: Fri, 21 May 2010 13:56:35 +0900 (JST)
Subject: [ruby-changes:15995] Ruby:r27940 (trunk): * configure.in (LIBRUBYARG_SHARED): shared library will not be
nobu 2010-05-21 13:55:48 +0900 (Fri, 21 May 2010) New Revision: 27940 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27940 Log: * configure.in (LIBRUBYARG_SHARED): shared library will not be created unless enable-shared. Modified files: trunk/ChangeLog trunk/configure.in Index: configure.in =================================================================== --- configure.in (revision 27939) +++ configure.in (revision 27940) @@ -2048,10 +2048,10 @@ AC_ARG_ENABLE(shared, AS_HELP_STRING([--enable-shared], [build a shared library for Ruby]), [enable_shared=$enableval]) -LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)' libprefix='$(libdir)' -if test "$enable_shared" = 'yes'; then +AS_CASE("$enable_shared", [yes], [ LIBRUBY='$(LIBRUBY_SO)' + LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)' LIBRUBYARG='$(LIBRUBYARG_SHARED)' test -z "$CCDLFLAGS" || CFLAGS="$CFLAGS $CCDLFLAGS" ENABLE_SHARED=yes @@ -2131,7 +2131,9 @@ [interix*], [ LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' ]) -fi +], [ + LIBRUBYARG_SHARED= +]) if test "$enable_rpath" = yes; then LIBRUBY_RPATHFLAGS="${linker_flag}-R ${linker_flag}${libprefix} -L\$(libdir)" LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" Index: ChangeLog =================================================================== --- ChangeLog (revision 27939) +++ ChangeLog (revision 27940) @@ -1,5 +1,8 @@ -Fri May 21 13:35:55 2010 Nobuyoshi Nakada <nobu@r...> +Fri May 21 13:55:46 2010 Nobuyoshi Nakada <nobu@r...> + * configure.in (LIBRUBYARG_SHARED): shared library will not be + created unless enable-shared. + * ruby.c (ruby_init_loadpath_safe): use real path for non-shared build. -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/