diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,4 +1,7 @@ -Fri May 21 13:35:55 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri May 21 13:55:46 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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. diff --git a/configure.in b/configure.in index 8a3c344b66..e3856d6de4 100644 --- a/configure.in +++ b/configure.in @@ -2048,10 +2048,10 @@ ENABLE_SHARED=no 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 @@ if test "$enable_shared" = 'yes'; then [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" |